From 1288eb57be4b37dccf5c0da70dac282e251ab20e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 12 三月 2024 15:34:31 +0800
Subject: [PATCH] 销售出库单：列表界面增加 多行下推(销售调价单)
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 6 +-
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBill.html | 77 ++++---------------------
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 62 ++++++++++++++++++++
3 files changed, 78 insertions(+), 67 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index b17ec97..f5b82ba 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5520,7 +5520,7 @@
<publishTime>01/30/2024 13:53:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞皟浠峰崟/Xs_SellOutChangeBill.html">
- <publishTime>03/12/2024 13:22:05</publishTime>
+ <publishTime>03/12/2024 15:16:29</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞皟浠峰崟/Xs_SellOutChangeBillList.html">
<publishTime>03/11/2024 16:51:17</publishTime>
@@ -5745,10 +5745,10 @@
<publishTime>03/07/2024 11:30:29</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>02/25/2024 21:38:07</publishTime>
+ <publishTime>03/12/2024 15:29:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>02/25/2024 21:38:07</publishTime>
+ <publishTime>03/12/2024 15:29:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_BarCodeNote.html">
<publishTime>03/04/2024 12:18:37</publishTime>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
index 3ee2c23..a346776 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBill.html"
@@ -852,7 +852,7 @@
var data = getUrlVars_JSON().data;
var dataArray = [];
for (var i = 0; i < data.length; i++) {
- var temp = getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ var temp = getPushSource_SellOutBillInit(data[i].hmainid, data[i].hsubid);
if (temp != "none") {
dataArray.push(temp);
} else {
@@ -861,25 +861,10 @@
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HDeptID": dataArray[0].HDeptID
- , "HDeptName": dataArray[0].閮ㄩ棬
- , "HEmpID": dataArray[0].HEmpID
- , "HEmpName": dataArray[0].涓氬姟鍛�
- , "HManagerID": dataArray[0].HManagerID
- , "HManagerName": dataArray[0].涓荤
- , "HMainSourceInterID": "0"
+ "HMainSourceInterID": dataArray[0].hmainid
, "HMainSourceEntryID": "0"
- , "HMainSourceBillNo": ""
+ , "HMainSourceBillNo": dataArray[0].鍗曟嵁鍙�
, "HMainSourceBillType": $("#BillType").val()
- , "HSupID": dataArray[0].HCusID
- , "HSupName": dataArray[0].瀹㈡埛
- , "HLinkMan": dataArray[0].鑱旂郴浜�
- , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
- , "HSellSID": dataArray[0].HSellSID
- , "HSellSName": dataArray[0].閿�鍞柟寮�
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
});
//瀛愯〃 璧嬪��
@@ -887,33 +872,21 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].HMaterID
+ "HMaterID": dataArray[i].hmaterid
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
+ , "HUnitID": dataArray[i].hunitid
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
- , "HTaxMoney": dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , "HWHID": $("#HWHID").val()
- , "鍙戣揣浠撳簱": $("#HWHName").val()
+ , "HQty_Old": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty_New": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HTaxPrice_Old": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxPrice_New": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate_Old": dataArray[i].绋庣巼
+ , "HTaxRate_New": dataArray[i].绋庣巼
+ , "HTaxMoney_Old": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
+ , "HTaxMoney_New": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
, "HRemark": ""
-
- , "HQty_Full": "0"
- , "HQty_Empty": "0"
- , "HQty_Back": "0"
- , "HCostPrice": "0"
- , "HCostMoney": "0"
- , "HSalePrice": "0"
-
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
, "HSourceInterID": dataArray[i].hmainid
, "HSourceEntryID": dataArray[i].hsubid
@@ -921,30 +894,6 @@
, "HSourceBillType": dataArray[i].HBillType
, "HRelationQty": "0"
, "HRelationMoney": "0"
-
- , 'HSPID': "0"
- , 'HSPName': ""
- , 'HSPGroupID': "0"
- , "HSPGroupName": ""
- , 'HSCWHID': "0"
- , 'HSCWHName': ""
- , 'HSCSPID': "0"
- , 'HSCSPName': ""
- , 'HBatchNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HPropertyID': "0"
- , 'HPropertyName': ""
- , 'HSecUnitID': "0"
- , 'HSecUnitName': ""
- , 'HSecUnitRate': "0"
-
-
- , 'HEngineNum': ""
- , 'HUnderPanNum': ""
- , 'HLeaveFactCard': ""
}
);
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index c51250e..58aa6cd 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -121,6 +121,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞皟浠峰崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
@@ -228,6 +229,10 @@
//澶氳涓嬫帹(搴旀敹鍗�)
case 'btn-PushReceivableBills':
set_PushReceivableBills();
+ break;
+ //澶氳涓嬫帹(閿�鍞皟浠峰崟)
+ case 'btn-PushSellOutChangeBills':
+ set_PushSellOutChangeBills();
break;
//鍒犻櫎
case 'btn-Delete':
@@ -762,6 +767,63 @@
}
//#endregion
+ //#region 澶氳涓嬫帹锛堥攢鍞皟浠峰崟锛�
+ function set_PushSellOutChangeBills() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length > 0) {
+ var dataArray = [];
+ var HBillNo = data[0].鍗曟嵁鍙�;
+ for (var i = 0; i < data.length; i++) {
+ var temp = {
+ "hmainid": data[i].hmainid
+ , "hsubid": data[i].hsubid
+ , "HBillStatus": data[i].鐘舵��
+ , "HSourceBillType": "1205"
+ }
+ dataArray.push(temp);
+ if (data[i].鐘舵�� != "宸插鏍�") {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+
+ //if (data[i].琛岀姸鎬� == "宸插叧闂�") {
+ // layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ // return;
+ //}
+
+ if (data[i].鍗曟嵁鍙� != HBillNo) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曞綊灞炰笉鍚屽崟鎹�!");
+ return;
+ }
+ }
+
+ var datajson = {
+ "data": dataArray
+ };
+
+ var url = encodeURI('../../閿�鍞鐞�/閿�鍞皟浠峰崟/Xs_SellOutChangeBill.html?OperationType=4&linterid=0&HSouceBillType=1205&res=' + JSON.stringify(datajson));
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閿�鍞嚭搴撳崟-澶氳涓嬫帹閿�鍞皟浠峰崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: url
+ , btn: ['纭畾']
+ // 鎸夐挳1 鐨勫洖璋�
+ ,end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+ //#endregion
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1