From 4fa8fbb994625c219cfeac7dcf875c9a65b932cb Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 19 一月 2024 12:58:29 +0800
Subject: [PATCH] 销售订单下推销售订单变更单、销售出库单、特批申请单、生产订单判定状态提示修改 销售出库单下推特批申请单判定状态提示修改 特批申请单下推收款单判定状态提示修改 销售订单变更单下推特批申请单判定状态提示修改
---
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html | 5 +++--
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 12 ++++++++----
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 3 ++-
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 22 +++++++++++-----------
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBillList.html | 3 ++-
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 3 ++-
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html | 3 ++-
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html | 3 ++-
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 3 ++-
9 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 5c8d6bb..a7367b9 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5235,16 +5235,16 @@
<publishTime>01/18/2024 14:20:46</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBill.html">
- <publishTime>12/11/2023 11:42:11</publishTime>
+ <publishTime>01/19/2024 12:40:49</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBillList.html">
<publishTime>01/18/2024 14:22:57</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html">
- <publishTime>01/18/2024 13:59:47</publishTime>
+ <publishTime>01/19/2024 12:38:25</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBillList.html">
- <publishTime>01/18/2024 14:25:00</publishTime>
+ <publishTime>01/19/2024 12:39:17</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Kf_ICStockBillMainList.html">
<publishTime>12/27/2021 13:54:32</publishTime>
@@ -5262,7 +5262,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/19/2024 11:40:54</publishTime>
+ <publishTime>01/19/2024 12:28:29</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -5283,16 +5283,16 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>01/19/2024 11:40:54</publishTime>
+ <publishTime>01/19/2024 12:28:29</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html">
<publishTime>01/19/2024 09:43:33</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html">
- <publishTime>11/30/2023 12:08:28</publishTime>
+ <publishTime>01/19/2024 12:36:37</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBillList.html">
- <publishTime>01/18/2024 14:17:58</publishTime>
+ <publishTime>01/19/2024 12:34:34</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Add_Edit_Kf_ICStockBillMainList.html">
<publishTime>12/21/2023 15:03:47</publishTime>
@@ -5445,16 +5445,16 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/19/2024 11:40:56</publishTime>
+ <publishTime>01/19/2024 12:45:15</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>01/19/2024 11:40:56</publishTime>
+ <publishTime>01/19/2024 12:45:15</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>01/19/2024 11:53:52</publishTime>
+ <publishTime>01/19/2024 12:24:26</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>01/19/2024 11:53:52</publishTime>
+ <publishTime>01/19/2024 12:24:26</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_BarCodeNote.html">
<publishTime>12/12/2023 23:49:26</publishTime>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index ef4c60b..44c1a74 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -576,7 +576,8 @@
layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
} else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") {
- layer.alert("淇濆瓨澶辫触!婧愬崟鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氭簮鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鐘舵��"] + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
return;
}
} else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 3fc7fae..8d128e0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -518,7 +518,7 @@
var HSourceBillData = getSourceBillStatus_SeOrderChangeBill(); //鑾峰彇婧愬崟鏁版嵁
} else {
HSourceBillData = "none";
- layer.alert("淇濆瓨澶辫触!璇锋簮鍗曠被鍨嬩笉涓洪攢鍞鍗曟垨閿�鍞嚭搴撳崟!", { icon: 5 });
+ layer.alert("淇濆瓨澶辫触!婧愬崟绫诲瀷涓嶄负閿�鍞鍗曘�侀攢鍞嚭搴撳崟鎴栭攢鍞鍗曞彉鏇村崟!", { icon: 5 });
return;
}
if (HSourceBillData != "none") {
@@ -526,7 +526,8 @@
layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
} else if (HSourceBillData[0]["鐘舵��"] != "鍒涘缓") {
- layer.alert("淇濆瓨澶辫触!婧愬崟鍗曟嵁鐘舵�佹湭涓�'鍒涘缓'鐘舵��!", { icon: 5 });
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氭簮鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鐘舵��"] + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
return;
}
} else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
index fc342e5..1a0c0cf 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
@@ -542,7 +542,8 @@
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "宸插鏍�") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
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/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/Xs_SeOrderBillList.html"
index dd6b5c1..e1d35b8 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/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/Xs_SeOrderBillList.html"
@@ -747,7 +747,8 @@
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "宸插鏍�") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -783,7 +784,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "鍒涘缓") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'鍒涘缓'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -821,7 +823,8 @@
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "宸插鏍�") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -869,7 +872,8 @@
}
dataArray.push(temp);
if (data[i].鐘舵�� != "宸插鏍�") {
- layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
index c32405f..0e7a1c5 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
@@ -407,7 +407,8 @@
layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
} else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") {
- layer.alert("淇濆瓨澶辫触!婧愬崟鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氭簮鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鐘舵��"] + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
return;
}
} else {
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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
index 82500c2..c858cba 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
@@ -541,7 +541,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "鍒涘缓") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'鍒涘缓'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
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.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.html"
index 2ab79f9..01a693c 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.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.html"
@@ -536,7 +536,8 @@
layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
- layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細婧愬崟鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
return;
} else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
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 4f2e567..79341db 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"
@@ -630,7 +630,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "鍒涘缓") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'鍒涘缓'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
--
Gitblit v1.9.1