MES-WEB-LayUI.git

			@@ -242,6 +242,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>å·¥èºè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>å·¥åæ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo2">
			@@ -280,7 +281,7 @@
			, excel = layui.excel
			, soulTable = layui.soulTable
			, element = layui.element;

			var ins;
			var sWhere = "";
			var sWhere_ICMO = "";
			var option = [];
			@@ -503,6 +504,11 @@
			case 'set_Calendar':
			set_Calendar();
			break;
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			}
			});

			@@ -543,7 +549,7 @@
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["ä¼åçº§"]) == 0) {
			HYxjQty++
			}
			}
			}
			}
			if (HYxjQty > 0) {
			@@ -748,11 +754,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 +905,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 +922,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 });
			@@ -933,6 +938,7 @@
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, done: function (res, page, count) {
			soulTable.render(this);
			//res.data.forEach(function (item, index) {
			// if (data1.data.DataColor != undefined) {
			// var sj = data1.data.DataColor;
			@@ -964,7 +970,7 @@
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			ins = table.render(option);
			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			HinterID_S.push(data1.data[i]["hmainid"]);
			@@ -1158,7 +1164,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 +1174,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 +1490,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 +1555,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 +1588,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"];

			@@ -2209,6 +2223,27 @@
			}
			option.data = dataPush;
			table.render(option);

			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -2428,7 +2463,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 +2474,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 +2601,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
			@@ -2575,17 +2610,60 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HSourceID": OptionData.HItemID
			, "çäº§èµæº": OptionData.çäº§èµæºåç§°
			})
			if (OptionData.length > 0) {
			obj.update({
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
			})
			OptionData = [];
			}
			}
			})
			}
			obj.event = "";
			return false;
			}
			} else if (event.key == "F8") {
			//çäº§èµæº
			if (obj.event == "HSourceID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "çäº§èµæºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_Source.html?HMaterID=" + obj.data["HMaterID"], "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "çäº§èµæº": checkStatus.data[0].HName
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].HName
			})
			OptionData = [];
			}
			}
			})
			}
			obj.event = "";
			}
			})
			}

			@@ -2646,7 +2724,6 @@
			}
			}


			//æ¥è¯¢æªæäº§ççäº§è®¢å
			function get_Display2(sWhere_ICMO) {
			var ajaxLoad = layer.load();
			@@ -2697,6 +2774,27 @@

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn_ICMO();


			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);

			layer.close(ajaxLoad);
			//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			@@ -2806,6 +2904,18 @@
			})
			}

			function get_Export() {
			var data = option.data
			data.forEach((item) => {
			// å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
			if (item.è§æ ¼åå·.length > 0) { // åè®¾åæ®µåä¸ºfield
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			}

			//æäº§åè½
			function set_Arrangement() {
			var checkStatus = table.checkStatus('mainTable_ICMO')
			@@ -2826,57 +2936,17 @@
			// obj[key] = value;
			//}
			//è·åå¾éä¸çå¾æçäº§è®¢å
			//è·åæ°æ®
			var hmainid = [];
			//var HEntryID = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			var newObj = {
			"HMaterID" : data[i].HMaterID,
			"HProdORGID" : data[i].HPRDORGID,
			"HUnitID" : data[i].HUnitID,
			"HWorkShopID" : data[i].HDeptID,
			"æåæ°é" : data[i].çäº§ä»»å¡åæ°é,
			"æºåä¸»åç " : data[i].hmainid,
			"æºåååç " : data[i].HEntryID,
			"ç©æä»£ç " : data[i].äº§åä»£ç ,
			"ç©æåç§°" : data[i].äº§ååç§°,
			"çäº§ç»ç»": data[i].çäº§ç»ç»,
			"çäº§è®¢ååæ®ç±»å" : data[i].åæ®ç±»å,
			"çäº§è®¢åå·" : data[i].åæ®å·,
			"çäº§è®¢åæç»è¡å·" : data[i].HEntryID,
			"çäº§è½¦é´" : data[i].çäº§è½¦é´,
			"è§æ ¼åå·" : data[i].è§æ ¼åå·,
			"è®¡åå¼å§æ¥æ" : data[i].è®¡åå¼å·¥æ¥æ,
			"è®¡åæ°é" : data[i].çäº§ä»»å¡åæ°é,
			"è®¡åç»ææ¥æ" : data[i].è®¡åå®å·¥æ¥æ,
			"è®¡éåä½" : data[i].è®¡éåä½,
			"è®¢åå¯ææ°é" : data[i].çäº§ä»»å¡åæ°é,
			"è®¢åççº§" : data[i].è®¢åççº§,
			"è®¢åç±»å" : data[i].åæ®ç±»å,
			"éå®è®¢åå·" : data[i].éå®è®¢åå·,
			"éå®è®¢åæ°é" : data[i].éå®æ°é
			}

			option.data.push(newObj);
			table.render(option)
			}

			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
			hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);
			//æ¥è¯¢çäº§è®¢å
			SelectICMOBill(hmainid);

			//var wait = layer.load();
			////é»è¾æ¹æ³
			@@ -3166,4 +3236,5 @@
			function GetGySource(data) {
			OptionData = data
			}

			</script>