MES-WEB-LayUI.git

			@@ -258,19 +258,25 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<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">
			<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">
			<div class="layui-input-block" style="margin-left: 70px;">
			<div class="layui-input-block" style="margin-left: 96px;">
			<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 class="layui-inline">
			<div class="layui-input-block" style="margin-left: 185px;">
			<input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº" checked>
			<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo" >
			</div>
			</div>

			@@ -284,13 +290,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hmakers" id="hmakers" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hchecker" id="hchecker" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -304,13 +310,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hmakedate" id="hmakedate" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -330,13 +336,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hupdater" id="hupdater" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -350,13 +356,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -401,14 +407,14 @@
			<!--å¤éæ¡ ä¸éæµè½¬å·¥åº-->
			<script type="text/html" id="HNextProcFlag">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HNextProcFlag" 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>

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

			@@ -479,7 +485,7 @@
			, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			, { field: 'HCenterID_SName', title: 'äº§çº¿ä¸å¿', edit: 'text', event: "CheckHCenterID_S" }//f7
			//, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			, { field: 'HWorkQty_S', title: 'äº§çº¿äº§è½', edit: 'text' }
			, { field: 'HSubStdEmpQty_S', title: 'äº§çº¿äººæ°', edit: 'text' }
			, { field: 'HMouldNo', title: 'æ¨¡å·ç¼å·', edit: 'text' }
			@@ -490,11 +496,11 @@
			, { field: 'HMyWorkDays', title: 'çäº§å¨æ', edit: 'text' }
			, { field: 'HMyFixWorkDays', title: 'åºå®çäº§å¤©æ°', edit: 'text' }
			, { field: 'å·¥åº', title: 'å·¥åº', edit: 'text', event: "CheckHProcID" }//f7
			//, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ' }//ä¸å¡«
			//, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿', edit: 'text', event: "CheckHCenterID" }//f7
			//, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå', edit: 'text', width: 110, event: "CheckHSupID" }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			@@ -550,6 +556,8 @@
			//åå§å è½½è¡¨æ ¼
			option.data = rowdata;
			table.render(option);
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();

			//å¶åäºº
			$("#HMaker").val(sessionStorage["HUserName"]);
			@@ -587,7 +595,7 @@
			}
			else if (OperationType == 2) {
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			//$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -608,8 +616,7 @@
			//RoadBillSub(linterid);
			}

			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();


			//#endregion

			@@ -649,6 +656,18 @@
			//æ¯å¦é»è®¤å·¥èº
			form.on('checkbox(checkboxHStandard)', function (data) {
			$("#HStandard").val(data.elem.checked);
			});

			//æ¯å¦è½¬å·¥åº
			form.on('checkbox(checkboxIsProNo)', function (data) {

			if (data.elem.checked) {
			$("#IsProNo").val("1");
			}
			else {
			$("#IsProNo").val("0");
			}
			console.log($("#IsProNo").val())
			});

			//#region å¤éæ¡
			@@ -831,6 +850,22 @@
			set_GridCellCheck(obj); //è¡åå¿«æ·é®çé

			});

			//è¡åé¼ æ ç¦»å¼äºä»¶
			table.on('edit(mainTable)', function (obj) {
			if (obj.field == "HProcNo") {
			var num = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (obj.value == option.data[i]["HProcNo"]) {
			num += 1;
			}
			if (num > 1) {
			layer.msg("æµæ°´å·:" + obj.value + "éå¤!");
			return false;
			}
			}
			}
			})

			$('#HName').on('keydown', function (event) {//å·¥èºè·¯çº¿åç§°
			if (event.keyCode == 118) {
			@@ -1060,6 +1095,8 @@
			$("#HMaterName").val(checkStatus.data[0].HName);//ç©æåç§°
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);//ç©æä»£ç
			$("#HMaterModel").val(checkStatus.data[0].HModel);//è§æ ¼åå·
			$("#HUnitID").val(checkStatus.data[0].HUnitID);//è®¡éåä½id
			$("#HUnitName").val(checkStatus.data[0].HUnitName);//è®¡éåä½åç§°

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1333,7 +1370,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_SupplierList.html", "yes"]
			, content: ["../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1345,9 +1382,9 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"ä¾åºå": checkStatus.data[0].HName
			"ä¾åºå": checkStatus.data[0].ä¾åºååç§°
			, "HSupID": checkStatus.data[0].HItemID
			, "ä¾åºåä»£ç ": checkStatus.data[0].HNumber
			, "ä¾åºåä»£ç ": checkStatus.data[0].ä¾åºåä»£ç
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1377,6 +1414,9 @@
			var IsHStopflag = d.data[0].é»è®¤å·¥èº;
			if (IsHStopflag == 1) {
			$("input[name='checkboxHStandard']").prop("checked", true);
			}
			else {
			$("input[name='checkboxHStandard']").prop("checked", false);
			}
			//ä¸»è¡¨
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			@@ -1411,6 +1451,15 @@
			, "HProductNum": d.data[0].æåç¼å·
			, "HVerNum": d.data[0].çæ¬
			, "HOrgID": d.data[0].HOrgID
			//å¶ä»ä¿¡æ¯
			, "hmakers": d.data[0].å¶åäºº
			, "hmakedate": d.data[0].å¶åæ¥æ==null?"":Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")
			, "hchecker": d.data[0].å®¡æ ¸äºº
			, "hcheckdate": d.data[0].å®¡æ ¸æ¥æ == null ? "" : Format(new Date(d.data[0].å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "hupdater": d.data[0].ä¿®æ¹äºº
			, "hupdatedate": d.data[0].ä¿®æ¹æ¥æ == null ? "" : Format(new Date(d.data[0].ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "hdeleteman": d.data[0].ä½åºäºº
			, "hdeletedate": d.data[0].ä½åºæ¥æ == null ? "" :Format(new Date(d.data[0].ä½åºæ¥æ), "yyyy-MM-dd")
			});

			//åè¡¨ èµå¼
			@@ -1529,21 +1578,17 @@
			// layer.msg("çäº§çç»æ²¡æéæ©");
			// return false;
			//}
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
			num.push(option.data[i]["HProcNo"]);
			} else {
			layer.msg("æµæ°´å·:" + option.data[i]["HProcNo"] + "éå¤!");
			return false;
			}
			}

			return true;
			//if ($("#HBillNo").val() == '') {
			// layer.msg("éè¯¯çåæ®å·", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if ($("#HInterID").val() == '') {
			// layer.msg("éè¯¯çåç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (typeof (sSubStr) == "undefined") {
			// layer.msg("æ²¡æç©ææç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}

			}

			//éèåè®¾ç½®
			@@ -1587,6 +1632,7 @@
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {