From 9d7dda331f3498a95e2e922e9ddae0fa43e83605 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:38:06 +0800
Subject: [PATCH] 修改问题

---
 HTML/views/ASNSetting/ArrivalNoticeDetail.html |  317 +++++++++++++++++++++++++---------------------------
 1 files changed, 152 insertions(+), 165 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 068f453..c9f20f8 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -21,17 +21,18 @@
 			margin-left: -15px;
 			margin-right: -15px;
 		}
-		.layui-table-mend{
+
+		.layui-table-mend {
 			position: relative;
 		}
 	</style>
 	<script>
 		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
-		document.addEventListener("DOMContentLoaded", function() {
+		document.addEventListener("DOMContentLoaded", function () {
 			//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
 			GetIsSetColW();
 		});
-	  </script>
+	</script>
 </head>
 
 <body>
@@ -49,7 +50,7 @@
 					<!-- <option value=""></option> -->
 					<!-- JC24 -->
 					<option value="0" selected>鎴愬搧鍏ュ簱</option>
-					<option value="1">閲囪喘鍏ュ簱</option>					
+					<option value="1">閲囪喘鍏ュ簱</option>
 					<option value="2">涓棿鍝佸叆搴�</option>
 					<option value="3">閫�璐у叆搴�</option>
 					<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
@@ -63,7 +64,9 @@
 				</select>
 			</div>
 
-			<label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">瀹㈡埛</p></label>
+			<label class="layui-form-label" style="width: 70px;">
+				<p id="CustomerNamep">瀹㈡埛</p>
+			</label>
 			<div class="layui-input-inline">
 				<select name="CustomerName" id="CustomerName" lay-verify="" lay-search>
 					<option value=""></option>
@@ -80,8 +83,10 @@
 		<div class="layui-form-item" style="margin-bottom: 0;">
 			<div class="layui-card">
 				<div class="layui-card-body">
-					<div class="position-relative" style="width: 100%;right: 0;"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
-						<table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+					<div class="position-relative" style="width: 100%;right: 0;">
+						<!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+						<table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list">
+						</table>
 						<!-- #region 鑷畾涔夎〃澶� -->
 						<div class="headerSetIcon">
 							<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
@@ -91,7 +96,7 @@
 						<!-- #endregion -->
 
 						<!-- #region 鑷畾涔夎〃澶�-->
-						<script type="text/html" id="templetUDF5">							
+						<script type="text/html" id="templetUDF5">
 							{{# function GetBtn(d){
 									var html = ''; 
 									html+= '<select name="UDF5" lay-filter="SelctUDF5" data-value="'+d.UDF5+'">'+
@@ -107,7 +112,7 @@
 						</script>
 						<!-- #endregion -->
 
-					</div>					
+					</div>
 					<script type="text/html" id="switchTpl">
 						<input type="checkbox" name="IsBale" value="{{d.SkuNo}}" lay-skin="switch" lay-text="鏄瘄鍚�" lay-filter="IsBaleDemo" {{ d.IsBale == "1" ? 'checked' : '' }}>
 					</script>
@@ -151,35 +156,39 @@
 				, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
 			});
 			var arr = [];
-			var TypeValue=$("#Type").val();
+			var TypeValue = $("#Type").val();
 
 			// 鍔犺浇涓嬫媺淇℃伅
 			getCustomerList();
 
 			// table 鍩烘湰璁剧疆
 			//#region 鑷畾涔夎〃澶�
-			var TotalColsArr = [[ 
-						{field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
-						{field: 'Id',title: '鍏ュ簱鍗曟槑缁咺D',width: 120,align: 'center',fixed: 'left',hide: true, "disabled": true}, 
-						{field: 'SkuNo',title: '鐗╂枡缂栫爜',minWidth: 100,align: 'center',fixed: 'left', "disabled": true}, 
-						{field: 'SkuName',title: '鐗╂枡鍚嶇О',minWidth: 180,align: 'center',fixed: 'left', "disabled": true}, 
-						{field: 'LotNo',title: '鎵规鍙�',align: 'center',edit: 'text',minWidth: 130,fixed: 'left', "disabled": true}, 
-						{field: 'SupplierLot',title: '渚涜揣鎵规',width: 130,edit: 'text',event: 'setSign',fixed: 'left', "disabled": true}, 
-						{field: 'Qty',title: '鏁伴噺',align: 'center',width: 80,edit: 'number',event: 'dataNumber',fixed: 'left', "disabled": true},
-						{field: 'UnitName',title: '璁¢噺鍗曚綅',align: 'center',width: 70}, 
-						{field: 'Standard',title: '瑙勬牸',width: 160,align: 'center'}, 
-						{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',edit: 'text',width: 160}, 
-						{field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160, templet: "#table-content-Packlist"},
-						{field: 'Price',title: '鍗曚环',align: 'center',width: 80}, 
-						{field: 'Money',title: '閲戦',align: 'center',width: 100}, 
-						{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',edit: 'text',width: 140}, 
-						{field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',edit: 'text',width: 140}, 
-						{field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',edit: 'text',width: 140}, 
-						{field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',edit: 'text',width: 140}, 
-						{field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'}, 
-						{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',templet: '#table-content-list', "disabled": true}
-					]];
-			var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			var TotalColsArr = [[
+				{ field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'Id', title: '鍏ュ簱鍗曟槑缁咺D', width: 120, align: 'center', fixed: 'left', hide: true, "disabled": true },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', minWidth: 100, align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', minWidth: 180, align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
+				{ field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
+				{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 80, edit: 'number', event: 'dataNumber', fixed: 'left', "disabled": true },
+				{ field: 'UnitName', title: '璁¢噺鍗曚綅', align: 'center', width: 70 },
+				{ field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', edit: 'text', width: 160 },
+				{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
+				{ field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+				{ field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+				{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', edit: 'text', width: 140 },
+
+				// { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
+				// { field: 'Money', title: '閲戦', align: 'center', width: 100 },
+				// { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 170, align: 'center', templet: '#table-content-list', "disabled": true }
+			]];
+			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
 			//#endregion
 
 			//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -337,20 +346,20 @@
 			//#region 鑷畾涔夎〃澶�
 			var infoOptions;
 			var colsJson;
-			var param1={
-				Href:'BllAsn/GetArrivalNoticeDetailList2'
+			var param1 = {
+				Href: 'BllAsn/GetArrivalNoticeDetailList2'
 			};
-			sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
-				if (res.code == 0){							
-					if(res.data=='' || res.data==undefined || res.data==null){
-						colsJson=TotalColsArr							
-					}else{
-						colsJson= eval(res.data);
+			sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+				if (res.code == 0) {
+					if (res.data == '' || res.data == undefined || res.data == null) {
+						colsJson = TotalColsArr
+					} else {
+						colsJson = eval(res.data);
 					}
-				}else{
-					colsJson=TotalColsArr
+				} else {
+					colsJson = TotalColsArr
 				}
-				infoOptions={
+				infoOptions = {
 					elem: '#LAY-app-content-list',
 					height: 'full-110',
 					id: 'LAY-app-content-list',
@@ -358,26 +367,26 @@
 					limit: pageCnt,
 					limits: pageLimits,
 					cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-					done: function(){	
+					done: function () {
 						//閫変腑涓嬫媺妗嗙殑鍊�		
 						layui.each($('select'), function (index, item) {
 							var elem = $(item);
-							if(elem.data('value')!='' && elem.data('value')!=undefined){
+							if (elem.data('value') != '' && elem.data('value') != undefined) {
 								elem.val(elem.data('value')).parents('table.layui-table-cell').css('overflow', 'visible');
-							}							
+							}
 						});
-						form.render();				
+						form.render();
 						//鑷畾涔夊垪瀹�
-						SetTableColW('LAY-app-content-list','BllAsn/GetArrivalNoticeDetailList2',TotalColsSysArr);
-					}, 
-					cols:colsJson 
+						SetTableColW('LAY-app-content-list', 'BllAsn/GetArrivalNoticeDetailList2', TotalColsSysArr);
+					},
+					cols: colsJson
 				};
 				// 娓叉煋Table
 				refreshTable(null);
 			});
 			//#endregion
 
-			
+
 
 			// 娣诲姞缂栬緫鏄庣粏 
 			var id = getQueryString('id');
@@ -392,8 +401,8 @@
 						console.log(res)
 						$("input[name='ASNNo']").val(res.data[0].ASNNo);
 						$("#Type option[value = '" + res.data[0].Type + "']").prop("selected", true);
-						$("#CustomerName option[value = '" + res.data[0].CustomerNo + "']").prop("selected", true);
 						$("#Type").attr("disabled", "disabled");
+						getCustomerList(res.data[0].CustomerNo);			// 鏍规嵁鍗曟嵁绫诲瀷鍔犺浇瀹㈡埛淇℃伅
 
 						var paramDetail = {
 							ASNNo: id,
@@ -413,7 +422,9 @@
 									curr: 1
 								}
 								table.render(infoOptions);
-								form.render('select');
+
+
+
 							} else { //涓嶆垚鍔�
 								layer.msg(res.msg, {
 									icon: 2,
@@ -439,6 +450,7 @@
 				active = {
 					add: function () {
 						var typeValue = $("#Type").val();
+						console.log(typeValue)
 						layer.open({
 							type: 2,
 							title: '娣诲姞鏄庣粏',
@@ -448,11 +460,11 @@
 							fixed: false,
 						});
 					},
-					customCols: function(){
+					customCols: function () {
 						layer.open({
 							type: 2,
 							title: '鑷畾涔夊垪',
-							content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList2&ColsSysArr='+TotalColsSysArr,
+							content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList2&ColsSysArr=' + TotalColsSysArr,
 							maxmin: false,
 							resize: false,
 							area: ['970px', '650px']
@@ -468,16 +480,16 @@
 			};
 
 			//鍗曟嵁绫诲瀷鍙樻洿鏃舵竻绌簍able鍒楄〃淇℃伅
-			form.on('select(Type)',function(data){
+			form.on('select(Type)', function (data) {
 				var value = data.value;
-				if(value!=TypeValue){
+				if (value != TypeValue) {
 					console.log(value);
 					getCustomerList();
 					arr = [];
 					// 娓叉煋Table
 					refreshTable(null);
-					TypeValue=value;
-				}    			
+					TypeValue = value;
+				}
 			});
 
 			//鐩戝惉淇敼UDF5涓嬫媺妗唘pdate鍒拌〃鏍间腑
@@ -490,49 +502,26 @@
 			});
 
 			//鐩戝惉鏁伴噺鍊煎彉鍖栬嚜鍔ㄨ绠楅噾棰�
-			table.on('edit(LAY-app-content-list)', function(obj){
-				if(obj.field=='Qty'){
-					var data=obj.data;
-					if(data.Qty!=undefined && data.Qty !=''){
-						data.Money=data.Qty*data.Price
-						
+			table.on('edit(LAY-app-content-list)', function (obj) {
+				if (obj.field == 'Qty') {
+					var data = obj.data;
+					if (data.Qty != undefined && data.Qty != '') {
+						data.Money = data.Qty * data.Price
+
 						var menu = layui.table.cache["LAY-app-content-list"];
-						for(var i =0;i<menu.length;i++){
-							if(menu[i].Id==data.Id){
-								menu[i].Money=data.Money
+						for (var i = 0; i < menu.length; i++) {
+							if (menu[i].Id == data.Id) {
+								menu[i].Money = data.Money
 								break;
 							}
 						}
 						$.extend(infoOptions, {
-								data: menu,
+							data: menu,
 						});
 						table.render(infoOptions);
 					}
 				}
 			})
-
-			// var IsBaleValue = "";
-			// form.on('switch(IsBaleDemo)', function (obj) {
-			// 	layer.tips(this.value + ' ' + this.name + '锛�' + obj.elem.checked, obj.othis);
-			// 	if (obj.elem.checked) {
-			// 		IsBaleValue = "1";
-			// 	} else {
-			// 		IsBaleValue = "0";
-			// 	}
-			// });
-
-			// table.on('row(LAY-app-content-list)', function (obj) {
-			// 	if (IsBaleValue != "") {
-			// 		for (var j in arr) {
-			// 			if (obj.data.SkuNo == arr[j].SkuNo) {
-			// 				arr[j].IsBale = IsBaleValue;
-			// 				IsBaleValue = ""
-			// 				break;
-			// 			}
-			// 		}
-			// 	}
-
-			// })
 
 			// 鍒犻櫎鍏ュ簱鍗曟槑缁�
 			table.on('tool(LAY-app-content-list)', function (obj) {
@@ -566,10 +555,10 @@
 					});
 					return;
 				}
-				var type= $("#Type").val();
-				if(type=='6'){
-					var customerName=$("#CustomerName").val();
-					if(customerName==''){
+				var type = $("#Type").val();
+				if (type == '6') {
+					var customerName = $("#CustomerName").val();
+					if (customerName == '') {
 						layer.msg("浠e偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -587,7 +576,7 @@
 					if (value == '') {
 						return '';
 					} else {
-						var ver = /^[0-9]+$/;
+						var ver =/^\\d+\\.\\d{1,4}$/;  // /^[0-9]+$/;
 						if (!ver.test(value)) {
 							return '鍙兘杈撳叆姝f暣鏁�';
 						}
@@ -606,7 +595,7 @@
 			}
 
 			// 缁戝畾涓嬫媺淇℃伅
-			function getCustomerList() {
+			function getCustomerList(CustomerNo) {
 				/*
 				0锛氬鎴�
 					閫�璐у叆搴�
@@ -622,58 +611,56 @@
 					if (res.code == 0) { //鎴愬姛
 						$("#CustomerName").empty();
 						$("#CustomerName").append('<option value =""></option>');
+
+						// 鏍规嵁鍗曟嵁绫诲瀷纭鍔犺浇鏄鎴穙r渚涘簲鍟唎r璐т富涓嬫媺淇℃伅
+						var TypeNum = 0;
+						switch ($("#Type").val()) {
+							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": //浠e偍鍏ュ簱
+							case "7": //瀵勫瓨鍏ュ簱
+								TypeNum = 2;
+								console.log(TypeNum)
+								break;
+						}
+
 						for (var i = 0; i < res.data.length; i++) {
-							var TypeNum = 0;
-							
-							switch($("#Type").val())
-							{
-								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": //浠e偍鍏ュ簱
-								case "7": //瀵勫瓨鍏ュ簱
-									TypeNum = 2;
-									console.log(TypeNum)
-									break;
-							}
+
 							//鍒ゆ柇鍗曟嵁绫诲瀷
-							if (TypeNum == 0)
-							{
-								if (res.data[i].Type == 0)
-								{
+							if (TypeNum == 0) {
+								if (res.data[i].Type == 0) {
 									$("#CustomerNamep").html("瀹㈡埛");
 									$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
-									res.data[i].CustomerName + '</option>');
+										res.data[i].CustomerName + '</option>');
 								}
 							}
-							else if (TypeNum == 1)
-							{
-								if (res.data[i].Type == 1)
-								{
-									$("#CustomerNamep").html("渚涘簲鍟�");
+							else if (TypeNum == 1) {
+								if (res.data[i].Type == 1) {
+									$("#CustomerNamep").html("鐢熶骇鍟�");
 									$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
-									res.data[i].CustomerName + '</option>');
+										res.data[i].CustomerName + '</option>');
 								}
 							}
-							else if (TypeNum == 2)
-							{
-								if (res.data[i].Type == 2)
-								{
+							else if (TypeNum == 2) {
+								if (res.data[i].Type == 2) {
 									$("#CustomerNamep").html("璐т富");
 									$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
-									res.data[i].CustomerName + '</option>');
+										res.data[i].CustomerName + '</option>');
 								}
 							}
 						}
+						// 鏍规嵁瀹㈡埛鍚嶇О鍔犺浇閫変腑鍊�
+						$("#CustomerName option[value = '" + CustomerNo + "']").prop("selected", true);
 						form.render('select');
 					} else { //涓嶆垚鍔�
 						layer.msg(res.msg, {
@@ -702,7 +689,7 @@
 					}
 					arr.push(data[i]); //灞炴��
 				}
-				
+
 				$.extend(infoOptions, {
 					data: arr
 				});
@@ -712,13 +699,13 @@
 				console.log(infoOptions)
 				table.render(infoOptions);
 			}
-			
+
 			// 娣诲姞鍏ュ簱鍗�
 			function SetArrivalNotice(data) {
 				var item2 = getAsnOrderInfo();
-				if (item2 !=-1) {
-					
-				
+				if (item2 != -1) {
+
+
 					if (doing) {
 						doing = false;
 						if (id == null) {
@@ -770,55 +757,53 @@
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						}, function () { doing = true });
 					}
-				}	
+				}
 			}
 
 			// 鎻愪氦鑾峰彇鍏ュ簱鍗曚俊鎭�
 			function getAsnOrderInfo() {
 				var DataList = [];
-				var reg = /^([0]|[0-9][0-9]*)$/;
+				var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;///^[+-]?\d+\.\d{0,4}$/i;    ///^([0]|[0-9][0-9]*)$/;
 				console.log(arr);
 				for (var i in arr) {
 					console.log(arr[i].LotNo);
 					console.log(arr[i].Qty);
-					if (arr[i].Qty == "" || arr[i].Qty ==undefined) {
+					if (arr[i].Qty == "" || arr[i].Qty == undefined) {
 						layer.msg("璇疯緭鍏ュ叆搴撴暟閲忥紒", {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						});
 						return -1;
 					}
-					if (arr[i].LotNo == "" || arr[i].LotNo ==undefined) {
+					if (arr[i].LotNo == "" || arr[i].LotNo == undefined) {
 						//鍒ゆ柇鏄惁涓哄搴斾笉闇�瑕佹壒娆$殑鍗曟嵁
 						var TypeNum = 0;
-							
-						switch($("#Type").val())
-						{
+
+						switch ($("#Type").val()) {
 							//1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
-							case "1" :
-							case "2" :
-							case "5" :
-							case "6" :
-							case "7" : 
+							case "1":
+							case "2":
+							case "5":
+							case "6":
+							case "7":
 								console.log($("#Type").val())
 								TypeNum = 1;
 								break;
 						}
 						console.log(TypeNum)
 
-						if (TypeNum == 0)
-						{
+						if (TypeNum == 0) {
 							layer.msg("璇疯緭鍏ユ壒娆★紒1", {
 								icon: 2,
 								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 							});
 							return -1;
 						}
-						
+
 					}
-					
+
 					if (!reg.test(arr[i].Qty)) {
-						layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
+						layer.msg("鍏ュ簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						});
@@ -832,22 +817,24 @@
 						Standard: arr[i].Standard,
 						LotNo: arr[i].LotNo,
 						LotText: arr[i].LotText,
-						Qty: parseInt(arr[i].Qty),
+						Qty:parseFloat(arr[i].Qty),
 						PackagNo: arr[i].PackagNo,
 						Price: arr[i].Price,
 						IsBale: arr[i].IsBale,
 						IsBelt: arr[i].IsBelt,
 						SupplierLot: arr[i].SupplierLot,
-						UDF1:arr[i].UDF1,
-						UDF2:arr[i].UDF2,
-						UDF3:arr[i].UDF3,
-						UDF4:arr[i].UDF4,
-						UDF5:arr[i].UDF5,
+						Lot1: arr[i].Lot1,
+						Lot2: arr[i].Lot2,
+						UDF1: arr[i].UDF1,
+						UDF2: arr[i].UDF2,
+						UDF3: arr[i].UDF3,
+						UDF4: arr[i].UDF4,
+						UDF5: arr[i].UDF5,
 					};
 					DataList.push(item); //灞炴��
 				}
 				console.log($("#CustomerName").find('option:selected').text());
-				
+
 				var item2 = {
 					ASNNo: $("#ASNNo").val(),
 					Type: $("#Type").val(),

--
Gitblit v1.8.0