MES-WEB-LayUI.git

			@@ -54,8 +54,8 @@
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 2px; ">
			<!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>-->

			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button>
			@@ -137,7 +137,7 @@
			<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="æ¯å¦é»è®¤å·¥èº">
			<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
			<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="æ¯å¦å¯ç¨" lay-skin="primary" lay-filter="checkboxHUseFlag">
			<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
			<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
			</div>
			</div>
			</div>
			@@ -145,7 +145,7 @@
			<div class="layui-inline" id="HIDDEN" style="display:none;">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥åº</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -175,47 +175,47 @@
			</div>
			<div class="layui-row">
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å å·¥æ°é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è¿è¡æ¶é´</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
			<label class="layui-form-label" style="width: 85px;">å å·¥æ°é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è¿è¡æ¶é´</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
			<!--<input type="hidden" value="å°æ¶" name="HMainTimeUnit" id="HMainTimeUnit">-->
			<!--</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥ä»·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥ä»·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ åèµæºæ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
			<label class="layui-form-label" style="width: 85px;">æ åèµæºæ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
			<!--style="background-color:#efefef4d;"-->
			<!--</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å èµæºå¢é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å èµæºå¢é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
			<!--style="background-color:#efefef4d;"-->
			<!--</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åèµæºåé</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åèµæºåé</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
			<!--style="background-color:#efefef4d;"-->
			<!--</div>
			</div>-->
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -225,7 +225,7 @@
			<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style=" width: 500px;">
			</div>
			</div>




			</div>
			@@ -427,10 +427,17 @@
			</div>
			</script>

			<!--å¤éæ¡ æäº§å·¥åºæ è®°-->
			<script type="text/html" id="HSortProcFlag">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HSortProcFlag" lay-filter="HSortProcFlag" id="HSortProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			<!--å¤éæ¡ ä¸éæµè½¬å·¥åº-->
			<script type="text/html" id="HNextProcFlag">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			<input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			@@ -482,7 +489,7 @@
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			@@ -520,6 +527,7 @@
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', edit: 'text', width: 110, event: "CheckHSupID" }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			, { field: 'HSortProcFlag', title: 'æäº§å·¥åºæ è®°', templet: "#HSortProcFlag" }//checkbox

			//, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
			@@ -786,6 +794,18 @@
			});
			});

			//æäº§å·¥åºæ è®°
			form.on('checkbox(HSortProcFlag)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HSortProcFlag = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});

			//ä¸éæµè½¬å·¥åº
			form.on('checkbox(HNextProcFlag)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			@@ -859,7 +879,7 @@
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			@@ -882,6 +902,10 @@
			//å§å¤åå©
			if (option.data[i - 1].HSupFlag) {
			$('#HSupFlag' + i + '').attr("checked", true);
			}
			//æäº§å·¥åºæ è®°
			if (option.data[i - 1].HSortProcFlag) {
			$('#HSortProcFlag' + i + '').attr("checked", true);
			}
			//ä¸éæµè½¬å·¥åº
			if (option.data[i - 1].HNextProcFlag) {
			@@ -922,6 +946,10 @@
			//å§å¤åå©
			if (option.data[i - 1].HSupFlag) {
			$('#HSupFlag' + i + '').attr("checked", true);
			}
			//æäº§å·¥åºæ è®°
			if (option.data[i - 1].HSortProcFlag) {
			$('#HSortProcFlag' + i + '').attr("checked", true);
			}
			//ä¸éæµè½¬å·¥åº
			if (option.data[i - 1].HNextProcFlag) {
			@@ -1477,7 +1505,7 @@
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": WorkCente[j]["å·¥åºåç§°"]
			, "HProcID": WorkCente[j]["HProcID"], "å·¥ä½ä¸å¿ä»£ç ": WorkCente[j]["å·¥ä½ä¸å¿ä»£ç "], "HCenterID": WorkCente[j]["HCenterID"], "å·¥ä½ä¸å¿": WorkCente[j]["å·¥ä½ä¸å¿åç§°"], "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			@@ -1839,7 +1867,7 @@
			, "HWorkQty_S": d.data[i].äº§çº¿äº§è½, "HSubStdEmpQty_S": d.data[i].äº§çº¿äººæ°, "HMouldNo": d.data[i].æ¨¡å·ç¼å·, "HChangeMould": d.data[i].æ¢æ¨¡æ¶é´, "HPackStd": d.data[i].å¨è½¬ç®±æ å
			, "HPack": d.data[i].å¨è½¬ç®±, "HPutArea": d.data[i].ææ¾åº, "HMyWorkDays": d.data[i].çäº§å¨æ, "HMyFixWorkDays": d.data[i].åºå®çäº§å¤©æ°, "å·¥åº": d.data[i].å·¥åº
			, "HProcID": d.data[i].hprocid, "å·¥ä½ä¸å¿ä»£ç ": d.data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterID": d.data[i].HCenterID, "å·¥ä½ä¸å¿": d.data[i].å·¥ä½ä¸å¿åç§°, "HSupID": d.data[i].HSupID
			, "ä¾åºåä»£ç ": d.data[i].ä¾åºåä»£ç , "ä¾åºå": d.data[i].ä¾åºå, "HSupFlag": d.data[i].å§å¤æ è®° == 0 ? false : true, "HTimeUnit": d.data[i].æ¶é´åä½, "HUnitTime": d.data[i].è¿è¡æ¶é´
			, "ä¾åºåä»£ç ": d.data[i].ä¾åºåä»£ç , "ä¾åºå": d.data[i].ä¾åºå, "HSupFlag": d.data[i].å§å¤æ è®° == 0 ? false : true, "HSortProcFlag": d.data[i].æäº§å·¥åºæ è®° == 0 ? false : true, "HTimeUnit": d.data[i].æ¶é´åä½, "HUnitTime": d.data[i].è¿è¡æ¶é´
			, "HWorkQty": d.data[i].å å·¥æ°é, "HPassRate": d.data[i].è¯ç, "HOverRate": d.data[i].è¶é¢æ¯ä¾, "HReadyTime": d.data[i].åå¤æ¶é´, "HQueueTime": d.data[i].æéæ¶é´
			, "HMoveTime": d.data[i].è½¬ç§»æ¶é´, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].æµè½¬å·¥åº == 0 ? false : true, "HSubStdEmpQty": d.data[i].æ åäººæ°, "HSubCanUseSourceQty": d.data[i].å¯æä½è®¾å¤æ°
			, "HFixPrice": d.data[i].çäº§å®é¢, "HProcPrice": d.data[i].å å·¥åä»·, "HBadPrice": d.data[i].ä¸åæ ¼åä»·, "HWasterPrice": d.data[i].æ¥åºåä»·, "HStdFlag": d.data[i].æ åå®é¢
			@@ -1859,6 +1887,9 @@
			for (var i = 0; i < d.data.length; i++) {
			if (d.data[i].å§å¤æ è®°) {
			$('#HSupFlag' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].æäº§å·¥åºæ è®°) {
			$('#HSortProcFlag' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HNextProcFlag) {
			$('#HNextProcFlag' + (i + 1)).attr("checked", true);
			@@ -1968,6 +1999,7 @@
			// layer.msg("çäº§çç»æ²¡æéæ©");
			// return false;
			//}
			var pc = 0;
			var num = [];
			for (var i = 0; i < option.data.length; i++) {

			@@ -1996,6 +2028,17 @@
			return false;
			}
			}

			//æäº§å·¥åºæ è®°
			if (option.data[i]["HSortProcFlag"]) {
			pc += 1;
			}

			if (pc > 1) {
			layer.msg("æäº§å·¥åºæ è®°åªè½éæ©ä¸ä¸ª,è¯·éæ°éæ©!");
			return false;
			}

			//else {
			// if (option.data[i]["HCenterID"] == "0") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			@@ -2036,7 +2079,6 @@
			}
			}
			}

			return true;
			}

			@@ -2210,7 +2252,7 @@
			//å°urlåæ°ä¸çä¸æä¹±ç éæ°è½¬æ¢æä¸æ
			function getParams(key) {
			var reg = new RegExp("(^\|&)" + key + "=([^&]*)(&\|$)");
			//å¦æå°åæ ä¸åºç°ä¸æåè¿è¡ç¼ç
			//å¦æå°åæ ä¸åºç°ä¸æåè¿è¡ç¼ç
			var r = encodeURI(window.location.search).substr(1).match(reg);
			if (r != null) {
			//å°ä¸æç¼ç çåç¬¦éæ°åæä¸æ