MES-WEB-LayUI.git

			@@ -98,7 +98,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥èºè·¯çº¿åç§°<label style="color:red"> * </label></label>
			<label class="layui-form-label" style="width: 90px;">å·¥èºè·¯çº¿åç§°*</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
			</div>
			@@ -108,7 +108,7 @@
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">äº§åä»£ç *</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<div class="layui-input-block" style="margin-left: 83px;">
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -133,7 +133,7 @@
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è®¡éåä½*</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<div class="layui-input-block" style="margin-left: 83px;">
			<input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
			@@ -151,11 +151,19 @@
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 96px;">
			<div class="layui-input-block" style="margin-left: 0px;">
			<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">-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»*</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			@@ -173,13 +181,20 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 20px;">
			</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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
			</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="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
			<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 class="layui-inline">
			@@ -248,26 +263,26 @@
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
			<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>-->



			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»*</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
			<!--å¨ææ¸²æç»ç»-->
			</select>
			<!--</select>
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			@@ -545,7 +560,7 @@

			//åå§è¡¨æ ¼æ°æ®
			var rowdata = [{
			"HProcNo": "10", "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			"HProcNo": "10", "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": "","å·¥åºä»£ç ":""
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": "","å·¥æ®µ":""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			@@ -573,12 +588,13 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, totalRow: true
			//, cellMinWidth: 120
			, height: 400
			, height: 450
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', field: 'åºå·', title: 'åºå·', totalRow: true }
			, { field: 'HProcNo', title: 'æµæ°´å·', edit: 'text' }
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç '}
			, { field: 'å·¥åº', title: 'å·¥åº', edit: 'text', event: "CheckHProcID" }//f7
			, { field: 'HProcID_S', title: 'å·¥æ®µID', hide: true }//, hide: true
			, { field: 'å·¥æ®µ', title: 'å·¥æ®µ', edit: 'text', event: "CheckHProcMulID" }//f7
			@@ -1445,6 +1461,8 @@
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			if (rowIndex === '0') {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else if (table.cache["mainTable"][obj.tr.data('index')].HProcNo == "9999") {
			layer.msg('ç³»ç»è½¬å·¥åºï¼ä¸åè®¸å é¤ï¼ï¼ï¼');
			} else {
			var oldData = table.cache["mainTable"];
			oldData.splice(obj.tr.data('index'), 1)
			@@ -1827,6 +1845,7 @@
			var j = 0;
			for (var i = (NowNum - 1); i < option.data.length; i++) {
			option.data[i]["å·¥åº"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["å·¥åºä»£ç "] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["å·¥ä½ä¸å¿"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			@@ -1839,7 +1858,7 @@
			//å¨ä¸æ¹æ·»å æ°çè¡¨æ ¼æ°æ®
			for (var i = 0; i < num; i++) {
			option.data.push({
			"HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			"HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": "", "å·¥åºä»£ç ": ProcessNumber[j].substring(1, ProcessNumber[j].length - 1)
			, "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
			@@ -1863,6 +1882,7 @@
			var j = 0;
			for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
			option.data[i]["å·¥åº"] = WorkCente[j]["å·¥åºåç§°"];
			option.data[i]["å·¥åºä»£ç "] = ProcessNumber[j].substring(1, ProcessNumber[j].length - 1);
			option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
			option.data[i]["å·¥ä½ä¸å¿"] = WorkCente[j]["å·¥ä½ä¸å¿åç§°"];
			option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
			@@ -1894,6 +1914,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"å·¥åº": OptionData[0].å·¥åºåç§°
			, "å·¥åºä»£ç ": OptionData[0].å·¥åºä»£ç
			, "HProcID": OptionData[0].HItemID
			, "å·¥ä½ä¸å¿": OptionData[0].å·¥ä½ä¸å¿
			, "HCenterID": OptionData[0].HWorkCenterID
			@@ -2283,7 +2304,7 @@
			for (var i = 0; i < d.data.length; i++) {
			rowdata.push(
			{
			"HProcNo": d.data[i].å·¥åºå·, "HProcID_S": d.data[i].å·¥æ®µ, "HProcType": d.data[i].å·¥åºç±»å, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].äº§çº¿ä¸å¿
			"HProcNo": d.data[i].å·¥åºå·, "HProcID_S": d.data[i].å·¥æ®µ, "HProcType": d.data[i].å·¥åºç±»å, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].äº§çº¿ä¸å¿, "å·¥åºä»£ç ": d.data[i].å·¥åºä»£ç
			, "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].å·¥åº, "å·¥æ®µ": d.data[i].å·¥æ®µåç§°
			, "HProcID": d.data[i].HProcID, "å·¥ä½ä¸å¿ä»£ç ": d.data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterID": d.data[i].HCenterID, "å·¥ä½ä¸å¿": d.data[i].å·¥ä½ä¸å¿åç§°, "HSupID": d.data[i].HSupID