From 6b8a9aef84d4d4ba8dd08b911ade7cfa6cc4fa4a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 26 一月 2024 16:51:07 +0800
Subject: [PATCH] 周总结
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 221 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 169 insertions(+), 52 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 441a912..c3ff143 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -98,6 +98,16 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
+ <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">閿�鍞竵鍒�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
@@ -111,16 +121,6 @@
<label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline" style="width:900px;">
- <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:700px;">
- <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 465px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
</div>
</div>
</div>
@@ -146,24 +146,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞富绠�</label>
- <div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鑱旂郴浜�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off" value="">
@@ -175,13 +157,8 @@
<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off" value="">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍐呴儴璁㈠崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color: #efefef4d;" autocomplete="off" readonly>
- </div>
- </div>
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
@@ -228,6 +205,30 @@
</div>
<!--闅愯棌瀛楁锛氭殏鏃舵病鏈夌敤澶�-->
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞富绠�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴璁㈠崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color: #efefef4d;" autocomplete="off" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
+ </div>
+ </div>
+ </div>
<div class="layui-row" style="display:none;">
<div class="layui-inline">
<label class="layui-form-label">缁撶畻鏃ユ湡</label>
@@ -544,6 +545,9 @@
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
+ "HItemID": "0",
+ "璁㈠崟绛夌骇浠ｇ爜": "",
+ "璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
@@ -560,7 +564,10 @@
"HDate": Format(new Date(), 'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": ""
};
switch (obj.event) {
//鏂板涓�琛�
@@ -649,7 +656,13 @@
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HlineTotal = dealDoubleToFixed(HlineTotal, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -691,7 +704,13 @@
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HlineTotal = dealDoubleToFixed(HlineTotal, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -733,7 +752,13 @@
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HlineTotal = dealDoubleToFixed(HlineTotal, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -775,7 +800,13 @@
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
-
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HlineTotal = dealDoubleToFixed(HlineTotal, 2);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -938,6 +969,12 @@
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: 'HOrderLevID', title: 'HOrderLevID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁㈠崟绛夌骇浠ｇ爜', title: '璁㈠崟绛夌骇浠ｇ爜', width: 150, edit: 'text', event: "HOrderLevID" }//f7
+ , { field: '璁㈠崟绛夌骇鍚嶇О', title: '璁㈠崟绛夌骇鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+ , { field: 'HCusMaterNumber', title: '瀹㈡埛鐗╂枡缂栫爜', width: 100, edit: 'text' }
+ , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
@@ -949,8 +986,6 @@
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
-
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, hide: true }
, { field: 'HTaxMoney', title: '绋庨', width: 100, hide: true }
@@ -965,6 +1000,9 @@
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
+ "HOrderLevID": "0",
+ "璁㈠崟绛夌骇浠ｇ爜": "",
+ "璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
@@ -981,7 +1019,10 @@
"HDate": Format(new Date(),'yyyy-MM-dd'),
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": ""
}];
option.data = rowdata;
@@ -1085,31 +1126,37 @@
"HMaterID": result.data[i]["HMaterID"],
"鐗╂枡浠ｇ爜": result.data[i]["鐗╂枡浠ｇ爜"],
"鐗╂枡鍚嶇О": result.data[i]["鐗╂枡鍚嶇О"],
+ "HOrderLevID": result.data[i]["HOrderLevID"],
+ "璁㈠崟绛夌骇浠ｇ爜": result.data[i]["璁㈠崟绛夌骇浠ｇ爜"],
+ "璁㈠崟绛夌骇鍚嶇О": result.data[i]["璁㈠崟绛夌骇鍚嶇О"],
"瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
"HUnitID": result.data[i]["HUnitID"],
"璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
- "HQty": result.data[i]["鏁伴噺"],
- "HPrice": result.data[i]["鍗曚环"],
- "HTaxPrice": result.data[i]["鍚◣鍗曚环"],
- "HMoney": result.data[i]["閲戦"],
+ "HQty": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
+ "HPrice": dealDoubleToFixed(result.data[i]["鍗曚环"], 3),
+ "HTaxPrice": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"], 3),
+ "HMoney": dealDoubleToFixed(result.data[i]["閲戦"],2),
"HDiscountRate": result.data[i]["鎶樻墸鐜�"],
"HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
"HTaxRate": result.data[i]["绋庣巼"],
"HTaxMoney": result.data[i]["绋庨"],
- "HlineTotal": result.data[i]["浠风◣鍚堣"],
+ "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"], 2),
"HlineTotalBB": result.data[i]["鏈綅甯佷环绋庡悎璁�"],
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
- "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]
+ "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
+ "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
+ "HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
+ "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"]
}
);
}
option.data = rowdata;
//鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
- option.cols[0][19].edit = null;
- option.cols[0][20].edit = null;
+ option.cols[0][22].edit = null;
+ option.cols[0][23].edit = null;
table.render(option);
@@ -1769,6 +1816,8 @@
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1777,7 +1826,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1794,7 +1843,8 @@
var NewRow = {
"HMaterID": "0", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁￠噺鍗曚綅": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
, "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
- , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": ""
+ , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
+ "HCusModel": "","HCusMaterName": ""
}
btnAddLine(NewRow);
}
@@ -1882,6 +1932,37 @@
}
})
}
+ //璁㈠崟绛夌骇
+ if (obj.event == "HOrderLevID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁㈠崟绛夌骇鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁㈠崟绛夌骇鍚嶇О": checkStatus.data[0].璁㈠崟绛夌骇
+ , "璁㈠崟绛夌骇浠ｇ爜": checkStatus.data[0].璁㈠崟绛夌骇浠ｇ爜
+ , "HOrderLevID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
obj.event = "";
return false;
}
@@ -2257,6 +2338,42 @@
});
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1