MES-WEB-LayUI.git

			@@ -145,8 +145,10 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			//è·ååæ°
			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			@@ -200,21 +202,21 @@
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'å¨å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HMaterName', title: 'å¨å·åç§°', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
			, { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
			, { field: 'HPropertyName', title: 'è¾å©å±æ§', edit: 'text', width: 100 }
			, { field: 'HPropertyName', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HSecUnitCode', title: 'è¾å©è®¡éåä½ä»£ç ', edit: 'text', event: 'HSecUnitCode', width: 100 }
			, { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½', edit: 'text', width: 100 }
			, { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½', width: 100 }
			, { field: 'HSecUnitRate', 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: 'HUnitName', title: 'è®¡éåä½', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HLeaveLife', title: 'åå©ä½å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HNewLife', title: 'æ°å©ä½å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HNewLeaveLife', title: 'æ°å©ä½å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			]]
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			@@ -222,7 +224,7 @@
			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
			table.render(option);
			}
			else {
			@@ -258,7 +260,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" };
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" };
			switch (obj.event) {
			case 'btn-AddLine':
			//table.cache["mainTable"].push(AddRow[rows]);
			@@ -337,8 +339,9 @@
			HMaterCode: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName,
			HMaterSpec: checkStatus.data[0].HModel,

			HDesignLife: 0, //è®¾è®¡å¯¿å½
			HLeaveLife: checkStatus.data[0].HLeaveLife,
			HNewLeaveLife: checkStatus.data[0].HNewLife,
			HDesignLife: checkStatus.data[0].HDesignLife, //è®¾è®¡å¯¿å½

			});

			@@ -486,7 +489,7 @@

			function RoadBillMain(hID)//å è½½è¡¨å¤´
			{
			alert(hID);

			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			$.ajax({
			url: GetWEBURL() + "Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai",
			@@ -598,7 +601,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			title: 'è´è´£äººåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -670,8 +673,14 @@


			form.on('submit(Exit)', function (data) {//
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é
			if (params[params[0]] == undefined) {
			//å³éé¡µç¾
			Pub_Close(2);
			}
			else {
			//å³éå¼¹çª
			Pub_Close(1);
			}
			});


			@@ -701,9 +710,9 @@
			data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr;
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];

			if (AllowLoadData()) {
			if (AllowLoadData(sSubStr)) {
			$.ajax(
			{
			type: "POST",