MES-WEB-LayUI.git

			@@ -227,6 +227,9 @@
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100 }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HUseLife', title: 'ç´¯è®¡ä½¿ç¨å¯¿å½', edit: 'text', width: 120 }
			@@ -258,7 +261,7 @@
			//å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
			table.render(option);
			}
			else {
			@@ -294,7 +297,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
			switch (obj.event) {
			case 'btn-AddLine':
			//table.cache["mainTable"].push(AddRow[rows]);
			@@ -389,7 +392,47 @@
			}
			});
			}
			//è®¡éåä½ä»£ç
			if (obj.event === 'HUnitCode') //è®¡éåä½ä»£ç
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è®¡éåä½åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UnitInformation.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({
			HUnitID: checkStatus.data[0].HItemID,
			HUnitCode: checkStatus.data[0].HNumber,
			HUnitName: checkStatus.data[0].HName,
			});

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

			}
			});
			}
			if (obj.event === 'HStockOrgCode') //ç»ç»
			{
			//é¡µé¢å±-èªå®ä¹
			@@ -954,6 +997,7 @@
			Pub_Close(2);
			}
			});

			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			@@ -965,6 +1009,7 @@

			return [year, month, day].join('-');
			}

			form.on('submit(Saver)', function (data) {//ä¿å
			//debugger;
			data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
			@@ -1112,6 +1157,10 @@
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è°å¥ä»åºä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HUnitID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¡éåä½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HSCWHID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è°åºä»åºä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;