From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/SOSetting/ExportNotice.html | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b01f45e..ffa8410 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -62,33 +62,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <option value="5">涓棿鍝佸嚭搴�</option>
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
@@ -228,6 +209,8 @@
return "鍏朵粬鍑哄簱";
case "8":
return "瀵勫瓨鍑哄簱";
+ case "9":
+ return "閲囪喘閫�璐у嚭搴�";
default:
return "";
}
@@ -341,6 +324,21 @@
}}
{{ GetBtn9(d) }}
</script>
+
+ <script type="text/html" id="templetIsMixBox">
+ {{# function GetBtn10(d){
+ switch (d.IsMixBox) {
+ case "0":
+ return "鍚�";
+ case "1":
+ return "鏄�";
+ default:
+ return "";
+ }
+ }
+ }}
+ {{ GetBtn10(d) }}
+ </script>
<!-- #endregion -->
</div>
@@ -787,6 +785,7 @@
{ field: 'CompleteQty', title: '鎷ｈ揣鏁伴噺', align: 'center', width: 100 },
{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
+ { field: 'IsMixBox', title: '鏄惁鎷肩', align: 'center', templet: '#templetIsMixBox', width: 90 },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100 },
{ field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 120 },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120 },
@@ -1198,31 +1197,37 @@
isChongFu = true;
});
} else { //涓嶆垚鍔�
-
- layer.confirm('褰撳墠鍗曟嵁鎵规鍑哄簱鏄法鎵瑰嚭搴擄紝鏄惁璺ㄦ壒鍑哄簱锛�', function () {
- var param1 = {
- soNo: SoNo,
- tab: "1"
- };
- sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg("鎿嶄綔鎴愬姛锛�", {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- isChongFu = true;
- });
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- isChongFu = true;
- });
- }
+ if(res.code==2){
+ layer.confirm('褰撳墠鍗曟嵁鎵规鍑哄簱鏄法鎵瑰嚭搴擄紝鏄惁璺ㄦ壒鍑哄簱锛�', function () {
+ var param1 = {
+ soNo: SoNo,
+ tab: "1"
+ };
+ sendData(IP + "/BllSo/ExportAutoAllot", param1, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg("鎿嶄綔鎴愬姛锛�", {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ isChongFu = true;
+ });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ isChongFu = true;
+ });
+ }
+ })
})
- })
+ }else{
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
isChongFu = true;
}
});
--
Gitblit v1.8.0