MES-WEB-LayUI.git

			@@ -290,7 +290,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>æ¹éå¡«å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
			@@ -298,6 +298,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>åå¤æåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>éäº§çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>
			<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>
			@@ -330,6 +331,7 @@
			</script>
			<script>
			var OptionData = [];
			var OptionData_Emp = [];
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -565,6 +567,10 @@
			case 'set_Souce':
			set_Souce(data);
			break;
			//éæä½å·¥
			case 'set_Emp':
			set_Emp(data);
			break;
			//æ¥çå·¥èºè·¯çº¿
			case 'set_Routing':
			set_Routing();
			@@ -836,7 +842,6 @@
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			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: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			@@ -853,6 +858,7 @@
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });

			columns.push({
			field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			@@ -1009,7 +1015,7 @@
			return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			@@ -1040,6 +1046,7 @@
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			@@ -1060,7 +1067,7 @@
			sWhere = {
			HORGID: sessionStorage["OrganizationID"]
			, HBEGINDATE: field
			, HENDDATE: field
			, HENDDATE: field
			}
			get_Display_3(JSON.stringify(sWhere));
			});
			@@ -1079,14 +1086,14 @@
			// }
			// }
			// }
			//})
			//})
			}
			}
			}


			//ç¼ºæåæè¡¨æ ¼æ°æ®
			function set_InitGrid1(field) {
			var columns = [];
			var columns = [];
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			@@ -1095,7 +1102,7 @@
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true });
			columns.push({ field: Format(field, 'yyyy-MM-dd'), title: Format(field, 'MM.dd'), width: 70 })


			option_columns = columns;
			option3 = {
			elem: '#mainTable_Material'
			@@ -1107,7 +1114,7 @@
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, done: function (res, page, count) {
			soulTable.render(this);


			}
			};
			}
			@@ -1722,10 +1729,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>
			@@ -1793,7 +1800,7 @@
			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 });
			@@ -2726,12 +2733,59 @@
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//éæä½å·¥
			function set_Emp(data) {
			if (data != 0) {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "èååè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "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_Emp[0] = checkStatus.data[0];
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			var num = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (num >= data.length) {
			break;
			}
			if (option.data[i]["LAY_CHECKED"] == true) {
			option.data[i]["HEmpID"] = OptionData_Emp[0].HItemID;
			option.data[i]["æä½å·¥"] = OptionData_Emp[0].èååç§°;
			num += 1;
			}
			}
			table.render(option);
			}
			}
			})
			}
			else {
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//ä¿å
			function set_AddNew() {

			//å é¤åè¡¨æ°æ® ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var num = [];
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			@@ -2743,7 +2797,7 @@
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			}
			}

			//var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			@@ -2852,6 +2906,47 @@
			}
			})
			}

			//æä½å·¥
			if (obj.event == "HEmpID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "åå·¥åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "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_Emp[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "æä½å·¥": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			obj.update({
			"HEmpID": OptionData_Emp[0].HItemID
			, "æä½å·¥": OptionData_Emp[0].èååç§°
			})
			OptionData_Emp = [];
			}
			}
			})
			}

			obj.event = "";
			return false;
			} else if (event.key == "F8") {
			@@ -3145,7 +3240,7 @@
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			table.exportFile(ins.config.id, data, "xls");
			}

			//æäº§åè½
			@@ -3263,7 +3358,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -3492,7 +3589,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®


			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option3.cols[0].length - 1; i++) {
			@@ -3513,7 +3610,7 @@
			} else {
			option3.cols[0][i + 1]["style"] = "font-size:100%";
			}


			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			@@ -3536,7 +3633,7 @@
			else {
			break;
			}
			}
			}
			table.render(option3);
			} else {
			table.render(option3);
			@@ -3570,4 +3667,9 @@
			OptionData = data
			}

			//åå»è¿åæä½å·¥
			function GetHEmpValue(data) {
			OptionData_Emp = data
			}

			</script>