From 009e869b09a63efbc5e58e22f88ad0ed2a315e2b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:12:16 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 81 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 7d53f60..ea64c3a 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -55,6 +55,7 @@
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
<option value="5">鍏跺畠鍏ュ簱</option>
<option value="6">浠ｅ偍鍏ュ簱</option>
+ <option value="7">瀵勫瓨鍏ュ簱</option>
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
@@ -143,10 +144,6 @@
});
var arr = [];
var TypeValue=$("#Type").val();
-
- var type0 = [3]; //瀹㈡埛
- var type1 = [1,5]; //渚涘簲鍟�
- var type2 = [0,2,4,6]; //璐т富
// 鍔犺浇涓嬫媺淇℃伅
getCustomerList();
@@ -605,14 +602,31 @@
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
- //鍒ゆ柇鍗曟嵁绫诲瀷
- if (type0[0] == $("#Type").val())
+ var TypeNum = 0;
+
+ switch($("#Type").val())
{
- /*
- 0锛氬鎴�
- 閫�璐у叆搴�
- 3
- */
+ case "3": //閫�璐у叆搴�
+ TypeNum = 0;
+ console.log(TypeNum)
+ break;
+ case "1": //閲囪喘鍏ュ簱
+ case "5": //鍏跺畠鍏ュ簱
+ TypeNum = 1;
+ console.log(TypeNum)
+ break;
+ case "0": //鎴愬搧鍏ュ簱
+ case "2": //涓棿鍝佸叆搴�
+ case "4": //杞﹂棿浣欐枡鍏ュ簱
+ case "6": //浠ｅ偍鍏ュ簱
+ case "7": //瀵勫瓨鍏ュ簱
+ TypeNum = 2;
+ console.log(TypeNum)
+ break;
+ }
+ //鍒ゆ柇鍗曟嵁绫诲瀷
+ if (TypeNum == 0)
+ {
if (res.data[i].Type == 0)
{
$("#CustomerNamep").html("瀹㈡埛閫夋嫨");
@@ -620,13 +634,8 @@
res.data[i].CustomerName + '</option>');
}
}
- else if (type1[0] == $("#Type").val() || type1[1] == $("#Type").val())
+ else if (TypeNum == 1)
{
- /*
- 1锛氫緵搴斿晢
- 閲囪喘鍏ュ簱銆佸叾瀹冨叆搴�
- 1銆�5
- */
if (res.data[i].Type == 1)
{
$("#CustomerNamep").html("渚涘簲鍟嗛�夋嫨");
@@ -634,13 +643,8 @@
res.data[i].CustomerName + '</option>');
}
}
- else if (type2[0] == $("#Type").val() || type2[1] == $("#Type").val() || type2[2] == $("#Type").val() || type2[3] == $("#Type").val())
+ else if (TypeNum == 2)
{
- /*
- 2锛氳揣涓�
- 鎴愬搧鍏ュ簱銆佷腑闂村搧鍏ュ簱銆佽溅闂翠綑鏂欏叆搴撱�佷唬鍌ㄥ叆搴�
- 0銆�2銆�4銆�6
- */
if (res.data[i].Type == 2)
{
$("#CustomerNamep").html("璐т富閫夋嫨");
@@ -762,11 +766,32 @@
return -1;
}
if (arr[i].LotNo == "" || arr[i].LotNo ==undefined) {
- layer.msg("璇疯緭鍏ユ壒娆★紒", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return -1;
+ //鍒ゆ柇鏄惁涓哄搴斾笉闇�瑕佹壒娆＄殑鍗曟嵁
+ var TypeNum = 0;
+
+ switch($("#Type").val())
+ {
+ //1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ case "1" :
+ case "2" :
+ case "5" :
+ case "6" :
+ case "7" :
+ console.log($("#Type").val())
+ TypeNum = 1;
+ break;
+ }
+ console.log(TypeNum)
+
+ if (TypeNum == 0)
+ {
+ layer.msg("璇疯緭鍏ユ壒娆★紒1", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+
}
if (!reg.test(arr[i].Qty)) {
--
Gitblit v1.8.0