From 34f70b69d93447969c0094937a9693f80dde15a3 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 二月 2021 21:24:19 +0800
Subject: [PATCH] 销售出库跳转页签，产品入口解决新增提交问题
---
WebTM/views/仓存管理/仓库调拨/Cc_LookingForBillList.html | 2 +-
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 13 +++++++------
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 6 +++---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 12 +++++++-----
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 486d8b2..e36320b 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -1078,7 +1078,7 @@
<publishTime>02/24/2021 17:31:17</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBillList.html">
- <publishTime>02/25/2021 15:05:22</publishTime>
+ <publishTime>02/26/2021 21:06:26</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html">
<publishTime>02/25/2021 14:27:14</publishTime>
@@ -1201,7 +1201,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
- <publishTime>02/24/2021 13:22:27</publishTime>
+ <publishTime>02/26/2021 21:06:20</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1225,7 +1225,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
- <publishTime>02/20/2021 15:01:29</publishTime>
+ <publishTime>02/26/2021 19:01:53</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html"
index 05e4d60..6af06c4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html"
@@ -175,7 +175,7 @@
]]
};
- var index = layer.load(0, { shade: false });
+ var index = layer.load(0);
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
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_SellOutBill_Fast.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_SellOutBill_Fast.html"
index ebd31d9..4769384 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_SellOutBill_Fast.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_SellOutBill_Fast.html"
@@ -912,8 +912,10 @@
var sBillNo = $("#HBillNo").val()
var HSourceBillType = $("#HBillType").val()
if (event.keyCode == 13) {
+ var index = layer.load(0);
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "" || sInterID <= 0) {
+ layer.close(index);
layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
@@ -928,9 +930,7 @@
//$("#HDeptID").val(result.data[0].HDeptID);
//$("#HDeptName").val(result.data[0].HDeptName);
HSourceFlag = true;
- element.tabChange('tab-SellOutBill', '2');
- layer.load(3);
-
+ element.tabChange('tab-SellOutBill', '3');
table.render({
elem: '#wl-table'
, url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
@@ -952,14 +952,16 @@
// , page: true
//, height: 500
, done: function () {
- layer.closeAll("loading");
+ layer.close(index);
}
});
+ layer.close(index);
}
else {
+ layer.close(index);
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- layer.closeAll("loading");
+ layer.close(index);
}
});
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 65db348..1d65e24 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -253,6 +253,7 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
$("#HBarCode").focus();
@@ -473,7 +474,7 @@
});
form.on('submit(Cancel)', function () {
- sessionStorage["SourceFlag"] = false;
+ //sessionStorage["SourceFlag"] = false;
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
@@ -629,7 +630,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
success: function (result) {
debugger;
if (result.count == 1) {
@@ -660,7 +661,7 @@
$("#HDeptName").val(result.data.HDeptName);
$("#HDeptID").val(result.data.HDeptID);
$("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
//if (result.data.HSourceBillType == "3711") {
// $("#HBillType").val("3711");
@@ -672,7 +673,7 @@
element.tabChange('tab-ProductlnBill', '3');
}
else {
- if (sessionStorage["SourceFlag"] == "true") {
+ if (HSourceFlag == "true") {
element.tabChange('tab-ProductlnBill', '3');
}
else {
@@ -681,7 +682,7 @@
//$("#HDeptName").val(result.data.HDept);
//$("#HDeptID").val(result.data.HDeptID);
$("#HSourceBillNo").val(result.data.HSourceBillNo);
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
//if (result.data.HSourceBillType == "3711") {
// $("#HBillType").val("3711");
@@ -763,7 +764,7 @@
data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
layer.load(3)
element.tabChange('tab-ProductlnBill', '2');
table.render({
--
Gitblit v1.9.1