MES-WEB-LayUI.git

			@@ -80,7 +80,7 @@
			<input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
			</div>
			</div>


			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¥æ*</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -98,6 +98,15 @@
			</button>
			</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: 185px;">
			<select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
			<option value="0" selected>å¦</option>
			<option value="1">æ¯</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -110,16 +119,7 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è½¦é´</label>
			<div class="layui-input-block" style="margin-left: 71px;">
			<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>


			<div class="layui-inline" style="width: 51%;">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å®¢æ·</label>
			@@ -164,15 +164,15 @@
			</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: 75px;">
			<input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label" style="width: 85px;">çäº§èµæº</label>
			<div class="layui-input-block" style="margin-left: 75px;">
			<input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¡éåä½*</label>
			<div class="layui-input-block" style="margin-left: 71px;">
			@@ -258,9 +258,17 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<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="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<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="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			</div>
			@@ -384,6 +392,18 @@
			</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: 71px;">
			<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -437,7 +457,19 @@
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢
			else if (OperationType == 2) {
			RoadBillMain(linterid);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3710' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});
			}
			else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢
			//ç¦ç¨ç»ç»éé¡¹
			$("#HPRDORGID").attr("disabled", true);
			$("#HDate").attr("disabled", true);
			@@ -747,9 +779,9 @@
			$("#HModel").val(checkStatus.data[0].è§æ ¼åå·);
			$("#HUnitID").val(checkStatus.data[0].HUnitID);//è®¡éåä½id
			$("#HUnitName").val(checkStatus.data[0].è®¡éåä½åç§°);//è®¡éåä½åç§°
			$("#HWidth").val(checkStatus.data[0].HWidth);//å¹å®½
			$("#HWeight").val(checkStatus.data[0].HWeight);//åé
			$("#HColorRemark").val(checkStatus.data[0].æè²è¦æ±);//åé
			$("#HWidth").val(checkStatus.data[0].å¹å®½);//å¹å®½
			$("#HWeight").val(checkStatus.data[0].åé);//åé
			$("#HColorRemark").val(checkStatus.data[0].æè²è¦æ±);//æè²è¦æ±
			$("#HRemark").val(checkStatus.data[0].å¤æ³¨);//å¤æ³¨
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -888,7 +920,7 @@
			////$('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
			//$('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
			////$('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);


			}
			else {
			layer.close(index);
			@@ -966,6 +998,7 @@
			, "HUnitID": d.data[0].HUnitID
			, "HUnitName": d.data[0].è®¡éåä½
			, "HSTATUS": HSTATUS
			, "HIsStockQty": d.data[0].HIsStockQty
			, "HBomID": d.data[0].HBomID
			, "HBomName": d.data[0].BOMåç¼ç
			, "HPlanBeginDate": Format(new Date(d.data[0].è®¡åå¼å·¥æ¥æ), "yyyy-MM-dd")
			@@ -973,6 +1006,7 @@
			, "HBeginDate": Format(new Date(d.data[0].æè¿å¼å·¥æ¥æ), "yyyy-MM-dd")
			, "HEndDate": Format(new Date(d.data[0].æè¿å®å·¥æ¥æ), "yyyy-MM-dd")
			, "HRemark": d.data[0].è¡¨å¤´å¤æ³¨
			, "HRemark3": d.data[0].åºé¨å¤æ³¨
			, "HAuxQty": d.data[0].HAuxQty
			, "HAuxUnit": d.data[0].HAuxUnit
			, "HAuxUnitName": d.data[0].HAuxUnitName
			@@ -980,17 +1014,17 @@
			, "HWeight": d.data[0].HWeight
			, "HColorRemark": d.data[0].æè²è¦æ±
			//å¶ä»ä¿¡æ¯
			, "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")
			, "hmakers": OperationType == 2 ? "" : d.data[0].å¶åäºº
			, "hmakedate": OperationType == 2 ? "" : d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")
			, "hchecker": OperationType == 2 ? "" : d.data[0].å®¡æ ¸äºº
			, "hcheckdate": OperationType == 2 ? "" : d.data[0].å®¡æ ¸æ¥æ == null ? "" : Format(new Date(d.data[0].å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "hupdater": OperationType == 2 ? "" : d.data[0].ä¿®æ¹äºº
			, "hupdatedate": OperationType == 2 ? "" : d.data[0].ä¿®æ¹æ¥æ == null ? "" : Format(new Date(d.data[0].ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "hdeleteman": OperationType == 2 ? "" : d.data[0].ä½åºäºº
			, "hdeletedate": OperationType == 2 ? "" : d.data[0].ä½åºæ¥æ == null ? "" : Format(new Date(d.data[0].ä½åºæ¥æ), "yyyy-MM-dd")
			});
			form.render('select');


			}
			})
			}
			@@ -1283,7 +1317,7 @@
			// layer.msg("BOMæ²¡æéæ©");
			// return false;
			//}



			return true;
			}