MES-WEB-LayUI.git

			@@ -84,7 +84,7 @@
			<label class="layui-form-label">çç»</label>
			<div class="layui-input-inline">
			<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -94,7 +94,7 @@
			<label class="layui-form-label">ç»è®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -263,6 +263,7 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<script>
			var OptionData = [];
			//#region æå æ³¨é
			//#endregion
			layui.config({
			@@ -365,9 +366,9 @@
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
			"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType":0
			"HSourceBillType": 0
			};


			switch (obj.event) {
			//æ°å¢ä¸è¡
			case 'btn-AddLine': btnAddLine(NewRow);
			@@ -403,7 +404,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/GroupInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -413,7 +414,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].HName);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -453,7 +454,7 @@
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
			"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType": 0
			"HSourceBillType": 0, "HICMOTempID": 0
			}];
			table.render(option);
			//æé®ãæé®ä¸ãçåè°
			@@ -484,7 +485,7 @@
			table.cache["mainTable"].push({
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType": 0
			"HSourceBillType": 0, "HICMOTempID": 0
			});
			option.data = table.cache["mainTable"];
			table.render(option);
			@@ -718,7 +719,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../PublicPage/PartInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -730,17 +731,26 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMaterID: checkStatus.data[0].HItemID,
			HMaterCode: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName,
			HMaterSpec: checkStatus.data[0].HModel,
			HMaterCode: checkStatus.data[0].ç©æä»£ç ,
			HMaterName: checkStatus.data[0].ç©æåç§°,
			HMaterSpec: checkStatus.data[0].è§æ ¼åå·,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			}, end: function () {
			if (OptionData.length > 0) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			HMaterID: OptionData[0].HItemID,
			HMaterCode: OptionData[0].ç©æä»£ç ,
			HMaterName: OptionData[0].ç©æåç§°,
			HMaterSpec: OptionData[0].è§æ ¼åå·,
			});
			OptionData = [];
			}
			}
			});
			}
			@@ -756,7 +766,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../PublicPage/UnitInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -770,8 +780,8 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HUnitID: checkStatus.data[0].HItemID,
			HUnitCode: checkStatus.data[0].HNumber,
			HUnitName: checkStatus.data[0].HName
			HUnitCode: checkStatus.data[0].è®¡éåä½ä»£ç ,
			HUnitName: checkStatus.data[0].è®¡éåä½åç§°
			});

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -779,9 +789,16 @@
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			}, end: function () {
			if (OptionData.length > 0) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			HUnitID: OptionData[0].HItemID,
			HUnitCode: OptionData[0].è®¡éåä½ä»£ç ,
			HUnitName: OptionData[0].è®¡éåä½åç§°
			});
			OptionData = [];
			}
			}
			});
			}
			@@ -797,7 +814,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../PublicPage/SourceInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -811,8 +828,8 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HSourceID: checkStatus.data[0].HItemID,
			HSourceCode: checkStatus.data[0].HNumber,
			HSourceName: checkStatus.data[0].HName
			HSourceCode: checkStatus.data[0].çäº§èµæºä»£ç ,
			HSourceName: checkStatus.data[0].çäº§èµæºåç§°
			});

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -820,9 +837,16 @@
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			}, end: function () {
			if (OptionData.length > 0) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			HSourceID: OptionData[0].HItemID,
			HSourceCode: OptionData[0].çäº§èµæºä»£ç ,
			HSourceName: OptionData[0].çäº§èµæºåç§°
			});
			OptionData = [];
			}
			}
			});
			}
			@@ -838,7 +862,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?type=HManager', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -852,8 +876,8 @@
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HWorkerid: checkStatus.data[0].HItemID,
			HWorkerCode: checkStatus.data[0].HNumber,
			HWorkerName: checkStatus.data[0].HName
			HWorkerCode: checkStatus.data[0].èåä»£ç ,
			HWorkerName: checkStatus.data[0].èååç§°
			});

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -861,9 +885,16 @@
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			}, end: function () {
			if (OptionData.length > 0) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			HWorkerid: OptionData[0].HItemID,
			HWorkerCode: OptionData[0].èåä»£ç ,
			HWorkerName: OptionData[0].èååç§°
			});
			OptionData = [];
			}
			}
			});
			}
			@@ -893,16 +924,17 @@
			, { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
			, { field: 'HWorkerCode', title: 'æä½åä»£ç ', edit: 'text', event: 'HWorkerCode', width: 100 }
			, { field: 'HWorkerName', title: 'æä½ååç§°', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100 }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢å', edit: 'text', width: 100 }
			, { field: 'HICMOInterID', title: 'çäº§è®¢ååç ', edit: 'text', width: 100, hide: true }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢åååç ', edit: 'text', width: 100, hide: true }

			, { field: 'HSourceInterID', title: 'æºååç ', edit: 'text', width: 100, hide: true }
			, { field: 'HSourceInterID', title: 'æºååç ', edit: 'text', width: 100, hide: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', edit: 'text', width: 100, hide: true }
			, { field: 'HSourceBillNo', title: 'æºååå·', edit: 'text', width: 100, hide: true }
			, { field: 'HSourceBillType', title: 'æºåç±»å', edit: 'text', width: 100, hide: true }
			, { field: 'HICMOTempID', title: 'HICMOTempID', edit: 'text', width: 100, hide: true }

			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 150 }
			@@ -913,6 +945,7 @@
			, toolbar: '#toolbarDemo'
			, page: false
			, cellMinWidth: 120
			, totalRow: true
			, height: 500
			, cols: [columns]
			, done: function (res, curr, count) {
			@@ -933,8 +966,8 @@
			, { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
			, { field: 'HWorkerCode', title: 'æä½åä»£ç ', edit: 'text', event: 'HWorkerCode', width: 100 }
			, { field: 'HWorkerName', title: 'æä½ååç§°', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100 }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'çäº§æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HBadQty', title: 'ä¸è¯æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢å', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 150 }
			@@ -943,6 +976,7 @@
			id: 'mainTable_prodReport'
			, elem: '#mainTable_prodReport'
			, page: true
			, totalRow: true
			, limit: 1000
			, limits: [500, 1000, 1500, 2000, 3000]
			, cellMinWidth: 120
			@@ -995,7 +1029,7 @@
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
			"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType": 0
			"HSourceBillType": 0, "HICMOTempID": 0
			}];
			table.render(option);
			}
			@@ -1028,7 +1062,7 @@
			"HSourceName": data[i].çäº§èµæºåç§°, "HWorkerid": data[i].æä½åID, "HWorkerCode": data[i].æä½åä»£ç ,
			"HWorkerName": data[i].æä½ååç§°, "HQty": data[i].äº§é, "HBadQty": data[i].ä¸è¯æ°é == '' ? 0 : data[i].ä¸è¯æ°é, "HICMOBillNo": data[i].çäº§è®¢åå·,
			"HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].çäº§è®¢åå·,
			"HSourceBillType": 3710
			"HSourceBillType": 3710, "HICMOTempID": data[i].HICMOTempID
			});
			}

			@@ -1060,7 +1094,7 @@
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
			"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType": 0
			"HSourceBillType": 0, "HICMOTempID": 0
			}];
			table.render(option);
			}
			@@ -1076,7 +1110,7 @@
			"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
			"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
			"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
			"HSourceBillType": 0
			"HSourceBillType": 0, "HICMOTempID": 0
			}];
			table.render(option);
			}
			@@ -1202,15 +1236,15 @@
			//#region éç©ºéªè¯
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			var Result = true;
			if ($("#HDeptID").val() == '' \|\| $("#HDeptID").val() == null) {
			if ($("#HDeptID").val() == '' \|\| $("#HDeptID").val() == null \|\| $("#HDeptID").val() == "undefined" \|\| $("#HDeptID").val() == 0) {
			layer.msg("è½¦é´ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HGroupID").val() == '' \|\| $("#HGroupID").val() == null) {
			if ($("#HGroupID").val() == '' \|\| $("#HGroupID").val() == null \|\| $("#HGroupID").val() == "undefined" \| $("#HGroupID").val() == 0) {
			layer.msg("çç»ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HEmpID").val() == '' \|\| $("#HEmpID").val() == null) {
			if ($("#HEmpID").val() == '' \|\| $("#HEmpID").val() == null \|\| $("#HGroupID").val() == "undefined" \|\| $("#HEmpID").val() == 0) {
			layer.msg("ç»è®¡åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			@@ -1269,7 +1303,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/UserInformation.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?type=HEmp', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1277,7 +1311,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].HName);
			$("#HEmpName").val(checkStatus.data[0].èååç§°);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1294,7 +1328,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/DeptInformation.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1302,9 +1336,9 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			$("#HDeptNumber").val(checkStatus.data[0].HNumber);
			$("#HDeptNumber").val(checkStatus.data[0].é¨é¨ä»£ç );
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -1464,7 +1498,38 @@
			/window.location.href = url;/
			window.open(url)
			}

			//çäº§è½¦é´
			function GetHDeptNameValue(obj) {
			$("#HDeptName").val(obj[0].é¨é¨åç§°);
			$("#HDeptID").val(obj[0].HItemID);
			$("#HDeptNumber").val(obj[0].é¨é¨ä»£ç );
			}
			//çäº§çç»
			function GetHGroupValue(obj) {
			$("#HGroupName").val(obj[0].çç»åç§°);
			$("#HGroupID").val(obj[0].HItemID);
			}
			//ç»è®¡å
			function GetHEmpValue(obj) {
			$("#HEmpName").val(obj[0].èååç§°);
			$("#HEmpID").val(obj[0].HItemID);
			}
			//ç©æ
			function GetMaterValue(obj) {
			OptionData = obj;
			}
			//åä½
			function GetUnitValue(obj) {
			OptionData = obj;
			}
			//çäº§èµæº
			function GetGySource(obj) {
			OptionData[0] = obj;
			}
			//æä½å
			function GetHManagerValue(obj) {
			OptionData = obj;
			}
			</script>
			</body>
			</html>