MES-WEB-LayUI.git

			@@ -213,7 +213,7 @@
			var sWhere = "";
			var sBillType = "3801";
			var HModName = "Gy_BarCodeBill";
			var titleData = ["ç©æID", "æºåä¸»åç ", "æºåååç ", "è¾å©å±æ§ID", "è®¡éåä½ID", "å®¢æ·ID", "HItemID", "hmainid", "hsubid", "HinterID", "è½¦é´ID", "ä¾åºåID","HSTOCKORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["ç©æID", "æºåä¸»åç ", "æºåååç ", "è¾å©å±æ§ID", "è®¡éåä½ID", "å®¢æ·ID", "HItemID", "hmainid", "hsubid", "HinterID", "è½¦é´ID", "ä¾åºåID", "HSTOCKORGID","æä½åID","çç»ID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var HMaterID = "";
			var HBatchNo = "";
			@@ -267,7 +267,7 @@

			var rowdata = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "","HMTONo": ""
			}];
			//åå§åè¡¨æ ¼
			set_InitGrid();
			@@ -299,7 +299,7 @@

			var NewRow = {
			"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			};
			//console.log(NewRow);
			switch (obj.event) {
			@@ -398,8 +398,7 @@
			HBQty: 0, //ç®±æ°=æ°é/æå°åè£æ°é
			});
			}
			else
			{
			else {
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: value, //æ°é
			@@ -490,7 +489,7 @@
			title: '' + getSupType() + 'åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['95%', '80%'],
			area: ['95%', '95%'],
			maxmin: true,
			content: [url, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			@@ -543,6 +542,7 @@
			//for (let i = 0; i < result.list.length; i++) {
			// result.list[i].HMinQty = '';//ç¹å»ååæ ¼çæ¶åé»è®¤å¼0ä¸ä¼æ¸é¤ï¼å®¢æ·çäºä¼è§å¾å¾æªï¼æä»¥åç¨ç©ºåç¬¦ä¸²åä»£;
			//}
			console.log(result.list[0]);
			table.reload('mainTable', {
			data: result.list // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			@@ -600,8 +600,7 @@
			var HOrgType = $("#HOrgID").find("option:selected").html();
			//è·åéæ©çå·¥åä»£ç
			var CampanyName = $("#HWorksNumber").find("option:selected").html();
			if (CampanyName == "" \|\| CampanyName == null)
			{
			if (CampanyName == "" \|\| CampanyName == null) {
			CampanyName = "xxx";
			}
			//è·åéæ©çæºåç±»å
			@@ -627,7 +626,7 @@
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
			$("#HSourceBillType").val('1'); //éæ©ä¸ææ¡é»è®¤ç¬¬ä¸ä¸ªéé¡¹
			$("#HBarCodeType").val('0');
			var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
			var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: ''}]
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			@@ -635,6 +634,7 @@
			"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
			, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
			, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
			, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			}]
			table.reload('mainTable1', {
			data: arr1 // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			@@ -670,7 +670,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].ç©æä»£ç , HMaterName: checkStatus.data[0].ç©æåç§°, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].è®¡éåä½ä»£ç , HUnitName: checkStatus.data[0].è®¡éåä½, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].æ°é.toString("#0.00"), HMinQty: checkStatus.data[0].æå°åè£æ°, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
			var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].ç©æä»£ç , HMaterName: checkStatus.data[0].ç©æåç§°, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].è®¡éåä½ä»£ç , HUnitName: checkStatus.data[0].è®¡éåä½, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].æ°é.toString("#0.00"), HMinQty: checkStatus.data[0].æå°åè£æ°, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '' }]
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			@@ -833,6 +833,12 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 200 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 200 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 200 }
			, { field: 'HEmpID', title: 'æä½åID', width: 100, hide: true }
			, { field: 'HEmpNumber', title: 'æä½åä»£ç ', edit: 'text', width: 200, event: 'HEmpNumber'}
			, { field: 'HEmpName', title: 'æä½å', width: 200 }
			, { field: 'HGroupID', title: 'çç»ID', width: 100, hide: true }
			, { field: 'HGroupNumber', title: 'çç»ä»£ç ', edit: 'text', width: 200, event: 'HGroupNumber' }
			, { field: 'HGroupName', title: 'çç»åç§°', width: 200 }
			, { field: 'HBatchNo', title: 'æ¹å·', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'æ°é', edit: 'text', width: 100, totalRow: true}
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', totalRow: true, width: 100 }
			@@ -859,6 +865,7 @@
			, { field: 'HExpirationDateFlag', title: 'æ¯å¦å¯ç¨ä¿è´¨æ', width: 100, templet: '#switchTp3', unresize: false }
			, { field: 'HGiveAwayFlag', title: 'æ¯å¦èµ å', width: 100, templet: '#switchTpl', unresize: false }
			, { field: 'HDate', title: 'è¿ææ¥æ', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			option = {
			@@ -992,7 +999,7 @@
			, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
			, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
			, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			}];
			table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1006,7 +1013,7 @@
			"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
			, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
			, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
			, "HExpirationDateFlag": 0
			, "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
			}];
			table.render(option1);
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1147,7 +1154,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -1408,8 +1417,8 @@
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			//æ¨¡å·ä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			if (obj.event === 'HMaterNumber') //æ¨¡å·ä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			//ç©æä¿¡æ¯ å¦æå¨ç©æä»£ç å æF7
			if (obj.event === 'HMaterNumber') //ç©æä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			{
			//é¡µé¢å±-èªå®ä¹ //F7éæ©æ¨¡å·
			layer.open({
			@@ -1583,6 +1592,88 @@
			}
			});
			}
			//æä½åä»£ç
			if (obj.event === 'HEmpNumber') //æä½åä»£ç
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æä½ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HEmpID: checkStatus.data[0].HItemID,
			HEmpNumber: checkStatus.data[0].èåä»£ç ,
			HEmpName: checkStatus.data[0].èååç§°,
			});

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

			}
			});
			}
			//çç»ä»£ç
			if (obj.event === 'HGroupNumber') //çç»ä»£ç
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çç»åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HGroupID: checkStatus.data[0].HItemID,
			HGroupNumber: checkStatus.data[0].çç»ä»£ç ,
			HGroupName: checkStatus.data[0].çç»åç§°,
			});

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

			}
			});
			}
			obj.event = "";
			return false;
			}