MES-WEB-LayUI.git

			@@ -543,7 +543,7 @@
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["ä¼åçº§"]) == 0) {
			HYxjQty++
			}
			}
			}
			}
			if (HYxjQty > 0) {
			@@ -748,11 +748,11 @@
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
			@@ -899,8 +899,7 @@
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			@@ -917,7 +916,7 @@
			columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
			columns.push({ field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', width: 150, hide: true });
			columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });

			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			@@ -1158,7 +1157,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1168,9 +1167,9 @@
			}
			//è·åæ°æ®
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterModel").val(checkStatus.data[0].HModel);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterModel").val(checkStatus.data[0].è§æ ¼åå·);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -1484,9 +1483,10 @@
			}
			if (isNaN(data[i]["HSourceID"])) {
			return layer.msg("éæ©çäº§èµæº!!")
			}
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
			}

			$('#HProgressBar').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			<div class="layui-progress-bar" lay-percent="40%"></div>
			@@ -1548,6 +1548,13 @@

			table.render(option);

			data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			if (parseFloat(data[i]["å°æ¶äº§è½"]) == 0 \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == null \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == undefined) {
			return layer.alert("ç¬¬" + (i + 1) + 'è¡ï¼å°æ¶äº§è½æªè®¾ç½®ï¼è¯·æ ¸å¯¹æ°æ®ã' + '</br>' + '1.ç©ææªæ·»å å·¥èºè·¯çº¿' + '</br>' + '2.å·¥èºè·¯çº¿ä¸æªè®¾ç½®å°æ¶äº§è½' + '</br>' + '3.çäº§èµæºæªè®¾ç½®åçå·¥æ¶' + '</br>' + '4.çäº§èµæºä¸ç»å®å·¥ä½ä¸å¿ä¸å·¥èºè·¯çº¿ä¸è®¾ç½®çå·¥ä½ä¸å¿ä¸ä¸è´');
			}
			}

			} else {
			//layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -1574,7 +1581,7 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			if (data.data.length == 0) {
			return layer.msg("å½åç©ææ²¡æå·¥èºè·¯çº¿!");
			return layer.msg("å½åç©ææ²¡æå·¥èºè·¯çº¿!è¯·æ¥çç©ææå¯¹åºçå·¥ä½ä¸å¿æ¯å¦æ£ç¡®!");
			} else {
			var HInterID = data.data[0]["HInterID"];

			@@ -2428,7 +2435,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData = checkStatus.data[0];
			OptionData[0] = checkStatus.data[0];
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			@@ -2439,8 +2446,8 @@
			break;
			}
			if (option.data[i]["LAY_CHECKED"] == true) {
			option.data[i]["HSourceID"] = OptionData.HItemID;
			option.data[i]["çäº§èµæº"] = OptionData.çäº§èµæºåç§°;
			option.data[i]["HSourceID"] = OptionData[0].HItemID;
			option.data[i]["çäº§èµæº"] = OptionData[0].çäº§èµæºåç§°;
			num += 1;
			}
			}
			@@ -2566,7 +2573,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData = checkStatus.data[0];
			OptionData[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			@@ -2576,8 +2583,8 @@
			}
			, end: function () {
			obj.update({
			"HSourceID": OptionData.HItemID
			, "çäº§èµæº": OptionData.çäº§èµæºåç§°
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
			})
			}
			})
			@@ -3164,6 +3171,6 @@

			//åå»è¿åçäº§èµæº
			function GetGySource(data) {
			OptionData = data
			OptionData[0] = data
			}
			</script>