From 865eb3bcd1a25d5f9233f85c2549c6fe3da3ceb0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 六月 2024 23:45:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 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 1063193..f0b3567 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"
@@ -498,14 +498,7 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
- //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
- setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
- //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
- setHEarnestRateByHisStockGoods();
-
- //璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney($("#HEarnestRate").val() * 1);
+
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -523,14 +516,6 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
- //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
- setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
- //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
- setHEarnestRateByHisStockGoods();
-
- //璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -1484,20 +1469,18 @@
}
option.data = rowdata;
- //鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
- //option.cols[0][22].edit = null;
- //option.cols[0][23].edit = null;
-
table.render(option);
//鑾峰彇涓存椂瀹氶噾姣斾緥
- HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
+ HEarnestRateTemp = data.瀹氶噾姣斾緥;
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType_For_RoadBillMain();
//鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
setHEarnestRateByHisStockGoods();
+
+ $("#HEarnestRate").val(data.瀹氶噾姣斾緥);
//璁剧疆琛ㄥご鎵�闇�閲戦
set_HBillMoney($("#HEarnestRate").val() * 1);
@@ -1549,6 +1532,7 @@
//#endregion
//#region 瀹㈡埛閫夋嫨椤甸潰
+ //#region 瀹㈡埛閫夋嫨椤甸潰
function get_checkCus() {
var HEmpID = $("#HEmpID").val();
layer.open({
@@ -1557,7 +1541,7 @@
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1574,6 +1558,35 @@
, btn2: function (index, layero) { }
})
}
+ //#endregion
+
+ //#region 瀹㈡埛閫夋嫨椤甸潰-鍩虹璧勬枡
+ //function get_checkCus() {
+ // var HEmpID = $("#HEmpID").val();
+ // layer.open({
+ // type: 2//寮圭獥绫诲瀷
+ // , skin: 'layui-layer-rim' //鍔犱笂杈规
+ // , area: ['90%', '90%']//澶у皬
+ // , title: '瀹㈡埛鍒楄〃'//鏍囬
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+ // , btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // getCustomerByCusID(checkStatus.data[0].HItemID);
+ // //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ // getCustomerBalance(checkStatus.data[0].HItemID);
+
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) { }
+ // })
+ //}
+ //#endregion
//#endregion
//#region 缁撶畻鏂归�夋嫨椤甸潰
@@ -3470,6 +3483,16 @@
getCustomerBalance(obj[0].HItemID);
}
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ //$("#HCusName").val(obj[0].HName);
+ //$("#HCusID").val(obj[0].HItemID);
+ //鏍规嵁瀹㈡埛鑾峰彇鐩稿叧淇℃伅
+ getCustomerByCusID(obj[0].HItemID);
+ //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(obj[0].HItemID);
+ }
+
function GetHManagerValue(obj) //杩斿洖涓荤
{
$("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
--
Gitblit v1.9.1