MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<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/PageTitle.js"></script>
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -60,6 +61,7 @@
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align:center;"><b>å·¥åºæµè½¬å¡</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="5" style="padding:1px;">ç¾æ¯ä¿¡æ¯</li>
			@@ -83,27 +85,37 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HDate" id="HDate">
			<input type="datetime" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè²è¦æ±</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark">
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éå®è®¢åç±»å</label>
			<div class="layui-input-inline">
			<select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value=""></option>
			<option style="color:blue;" value="0">æ®éåæ®</option>
			<option style="color:blue;" value="1">è¿ä¿®åæ®</option>
			</select>
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -112,8 +124,8 @@
			<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -125,15 +137,15 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">äº§åè§æ ¼</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -157,33 +169,33 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -199,34 +211,40 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¹å®½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;">
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="background-color: #efefef4d; float: left;" 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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			</div>

			<div class="layui-row">
			<!--<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¾æ°é</label>
			<div class="layui-input-inline">
			@@ -265,24 +283,29 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">åé</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
			<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;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="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -310,7 +333,7 @@
			<label class="layui-form-label">è®¢åççº§</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HName" id="HName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HOrderLevID" id="HOrderLevID">
			<input type="hidden" class="layui-input" name="HOrderLevID" id="HOrderLevID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnOrderID" id="btnOrderID" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -328,7 +351,13 @@
			<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">ç½å¯è¦æ±</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width: 610px;">
			<input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width: 610px; 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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -522,15 +551,15 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æµè½¬å¡ç±»å</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label">æµè½¬å¡ç±»å</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -540,17 +569,17 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¯ä½ç©æä»£ç </label>
			<div class="layui-input-inline">
			@@ -634,6 +663,12 @@
			<input type="text" class="layui-input" name="HPickLabelNumber" id="HPickLabelNumber" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</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="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -652,7 +687,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
			<!--<input type="hidden" class="layui-input" name="HSeOrderEntryID" id="HSeOrderEntryID">
			<input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
			<input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -938,6 +973,13 @@

			//#region è¿å¥é¡µé¢å³å è½½

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "3772";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			$("#HPlanBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HPlanEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HPlanSendGoodsDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			@@ -1085,7 +1127,7 @@
			//è¡¨å¤´
			columns = [ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { type: 'numbers', title: 'åºå·'}
			, { field: 'HProcNo', title: 'æµæ°´å·', edit: 'text' }
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }
			, { field: 'HProcNumber', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcCheck" }
			@@ -1099,7 +1141,7 @@
			, { field: 'HSupNumber', title: 'ä¾åºåä»£ç ', edit: 'text', event: "HSupCheck" }
			, { field: 'HSupName', title: 'ä¾åºå' }
			, { field: 'HSupFlag', title: 'æ¯å¦å§å¤', templet: '#HSupFlag' }
			, { field: 'HQty', title: 'æµè½¬å¡æ°é', edit: 'text' }
			, { field: 'HQty', title: 'æµè½¬å¡æ°é', totalRow: true ,edit: 'text' }

			//, { field: 'HWorkRemark', title: 'å å·¥è¯´æ', edit: 'text' }
			//, { field: 'HDeptID', title: 'é¨é¨ID', hide: true }
			@@ -1124,6 +1166,7 @@
			, toolbar: '#toolbarDemo'
			, page: false
			//, cellMinWidth: 120
			, totalRow: true
			, height: 400
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			@@ -1224,7 +1267,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1234,10 +1277,10 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HProcName: checkStatus.data[0].å·¥åº
			HProcName: checkStatus.data[0].å·¥åºåç§°
			, HProcID: checkStatus.data[0].HItemID
			, HProcNumber: checkStatus.data[0].å·¥åºä»£ç
			, HCenterID: checkStatus.data[0].å·¥ä½ä¸å¿ID
			, HCenterID: checkStatus.data[0].HWorkCenterID
			, HCenterNumber: checkStatus.data[0].å·¥ä½ä¸å¿ä»£ç
			, HCenterName: checkStatus.data[0].å·¥ä½ä¸å¿
			//, HDeptID: checkStatus.data[0].é¨é¨ID
			@@ -1263,7 +1306,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_WorkCenterList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_WorkCenter.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1273,7 +1316,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HCenterName: checkStatus.data[0].å·¥ä½ä¸å¿
			HCenterName: checkStatus.data[0].å·¥ä½ä¸å¿åç§°
			, HCenterID: checkStatus.data[0].HItemID
			, HCenterNumber: checkStatus.data[0].å·¥ä½ä¸å¿ä»£ç
			});
			@@ -1465,7 +1508,6 @@
			}
			})
			});

			//æå°
			form.on('submit(btn_print)', function () {//äº§å

			@@ -1541,7 +1583,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/PartInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1551,9 +1593,9 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterModel1").val(checkStatus.data[0].HModel);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterModel1").val(checkStatus.data[0].è§æ ¼åå·);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1581,7 +1623,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/EqpInformation.html', 'yes'],
			content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1591,8 +1633,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEquipMentName").val(checkStatus.data[0].HName);
			$("#HEquipMentID").val(checkStatus.data[0].HInterID);
			$("#HEquipMentName").val(checkStatus.data[0].è®¾å¤åç§°);
			$("#HEquipMentID").val(checkStatus.data[0].hmainid);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -1624,7 +1666,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/DeptInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1634,7 +1676,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWorkShopName").val(checkStatus.data[0].HName);
			$("#HWorkShopName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HWorkShopID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1662,7 +1704,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SupplierInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1672,7 +1714,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSupName").val(checkStatus.data[0].HName);
			$("#HSupName").val(checkStatus.data[0].ä¾åºååç§°);
			$("#HSupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1749,7 +1791,7 @@
			, area: ['90%', '70%']//å¤§å°
			, title: 'å·¥èºè·¯çº¿åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_RoutingBillList.html?HMaterID=' + btnHMaterID + '&HProID=' + HProID, 'yes']
			, content: ['../../è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBillList.html?HMaterID=' + btnHMaterID + '&HProID=' + HProID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -2134,6 +2176,7 @@
			"HBillNo": OperationType==4?"": data.åæ®å·
			, "HInterID": OperationType == 4 ? "" : data.hmainid
			, "HMainSourceBillNo": OperationType == 5 ? data.åæ®å· : ""
			, "HMainSourceBillSubType": data.HMainSourceBillSubType
			, "HPRDORGID": data.HPRDORGID
			, "HDate": formatDate(data.æ¥æ)
			, "HOrderProcNO": data.è®¢åè·è¸ªå·
			@@ -2224,6 +2267,7 @@
			, "HMaterIDC": data.åææåç C
			, "HMaterIDD": data.åææåç D

			, "HPlanOrderProcNo": data.HPlanOrderProcNo

			//ç¾æ¯ä¿¡æ¯
			, "HHeight": data.æ¯é«
			@@ -2235,6 +2279,9 @@
			, "HSizing": data.å®åæµæ
			, "HSellDate": data.äº¤è´§æ¥æ

			, "HWidth_New": data.çäº§å¹å®½
			, "HWeight_New": data.çäº§åé
			, "HRemark_New": data.çäº§è§æ ¼

			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			@@ -2313,7 +2360,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: "è®¡éåä½åè¡¨" //æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_UnitList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -2323,7 +2370,7 @@
			}
			//è·åæ°æ®
			$("#HAuxUnit").val(checkStatus.data[0].HItemID);
			$("#HAuxUnitName").val(checkStatus.data[0].HName);
			$("#HAuxUnitName").val(checkStatus.data[0].è®¡éåä½åç§°);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -2491,6 +2538,7 @@
			$("#HICMOInterID").val(data.hmainid);
			$("#HICMOBillNo").val(data.çäº§è®¢åå·);
			$("#textBox2").val(data.çäº§è®¢åå·);
			$("#HMainSourceBillSubType").val(data.HMainSourceBillSubType);
			$("#HICMOEntryID").val(data.HEntryID);
			$("#HOrderProcNO").val(data.è®¢åè·è¸ªå·);
			$("#HMaterID").val(data.hmaterid);
			@@ -2542,6 +2590,13 @@
			$("#HCusNames").val(data.å®¢æ·);
			$("#HColorRemark").val(data.æè²è¦æ±);
			$("#HRemark3").val(data.åºé¨å¤æ³¨);

			$("#HWidth_New").val(data.çäº§å¹å®½);
			$("#HWeight_New").val(data.çäº§åé);
			$("#HRemark_New").val(data.çäº§è§æ ¼);

			$("#HPlanOrderProcNo").val(data.HPlanOrderProcNo);

			$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
			$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:éä¸ false:ä¸éä¸
			form.render("checkbox");