MES-WEB-LayUI.git

			@@ -59,6 +59,7 @@
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -72,7 +73,7 @@
			<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
			</div>
			</div>
			<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: 185px;">
			<select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
			@@ -88,62 +89,132 @@
			<option style="color:blue;" value="10">éªè¯</option>
			<option style="color:blue;" value="11">ä¸è¾¾</option>
			<option style="color:blue;" value="12">å¼å·¥</option>
			<option style="color:blue;" value="13">ç³è¯·å®¡æ¹</option>
			<option style="color:blue;" value="13">ç³è¯·å®¡æ¹</option>-->
			<!--<option style="color:blue;" value="14">ç³è¯·æ£éª</option>-->
			<option style="color:blue;" value="15">ç³è¯·æ£éª</option>
			<!--<option style="color:blue;" value="15">ç³è¯·æ£éª</option>
			<option style="color:blue;" value="16">å¤å®åæ ¼</option>
			<option style="color:blue;" value="17">å¤å®ä¸åæ ¼</option>

			</select>
			</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="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			</div>
			</div>
			<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;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			<input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" 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;padding: 9px 18px;">åæ´äºº</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			<input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" 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;padding: 9px 18px;">è´è´£é¨é¨</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
			<input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
			<input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" 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 class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<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;">
			<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">
			<label class="layui-form-label"> å¤æ³¨</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">
			<input type="text" class="layui-input" name="HRemark" id="HRemark">
			</div>
			</div>
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<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="HMaker" id="HMaker" 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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
			</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="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="HDeleteMan " id="HDeleteMan " 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="HBacker " id="HBacker " style="background-color:#efefef4d;" readonly>
			</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="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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</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="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="HDeleteDate" id="HDeleteDate" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			@@ -157,7 +228,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>-->
			</div>
			</script>
			</form>
			@@ -168,19 +239,33 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>

			<!--è¡ä¸æéæ©(ä¸å¡ç¶æ)-->
			<script type="text/html" id="HSTATUS">
			<select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS{{d.LAY_TABLE_INDEX+1}}">
			<option value="1">è®¡å</option>
			<option value="2">è®¡åç¡®è®¤</option>
			<option value="3">ä¸è¾¾</option>
			<option value="4">å¼å·¥</option>
			<option value="5">å®å·¥</option>
			<option value="6">ç»æ¡</option>
			<option value="7">ç»ç®</option>
			<!--è¡ä¸æéæ©-->
			<!--<script type="text/html" id="HBarCodeStatus_Old">
			<select name="HBarCodeStatus_Old" lay-filter="HBarCodeStatus_Old" id="HBarCodeStatus_Old{{d.LAY_TABLE_INDEX+1}}">
			<option value=""></option>
			<option value="æ£å¸¸">æ£å¸¸</option>
			<option value="å¨åº">å¨åº</option>
			<option value="åºåº">åºåº</option>
			<option value="ä½åº">ä½åº</option>
			<option value="éç¦»">éç¦»</option>
			<option value="ä¸è¯">ä¸è¯</option>
			<option value="æ¥åº">æ¥åº</option>
			</select>
			</script>-->

			<!--è¡ä¸æéæ©-->
			<script type="text/html" id="HBarCodeStatus_New">
			<select name="HBarCodeStatus_New" lay-filter="HBarCodeStatus_New" id="HBarCodeStatus_New{{d.LAY_TABLE_INDEX+1}}">
			<option value=""></option>
			<option value="æ£å¸¸">æ£å¸¸</option>
			<option value="å¨åº">å¨åº</option>
			<option value="åºåº">åºåº</option>
			<option value="ä½åº">ä½åº</option>
			<option value="éç¦»">éç¦»</option>
			<option value="ä¸è¯">ä¸è¯</option>
			<option value="æ¥åº">æ¥åº</option>
			</select>
			</script>

			<script>

			layui.config({
			@@ -200,15 +285,15 @@
			, laydate = layui.laydate
			var option = [];


			var HBarCodeStatusVal = [];
			var CopyHBarCodeStatusVal = [];
			//#endregion

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

			var rowdata = [{
			"HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
			, "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
			, "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
			"HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
			, "HBarCodeStatus_New": ""
			}];
			//åå§å
			set_ClearBill();
			@@ -222,10 +307,11 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3710' },
			data: { "HBillType": '1288' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInterID").val(d.data[0].HInterID);
			}
			});
			}
			@@ -234,9 +320,10 @@
			$("#HPRDORGID").attr("disabled", true);
			$("#HDate").attr("disabled", true);
			RoadBillMain(linterid);
			$("#HInterID").val(linterid);
			}


			$("#HMaker").val(sessionStorage["HUserName"]);

			//#endregion

			@@ -248,16 +335,20 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
			, "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
			, "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
			"HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
			, "HBarCodeStatus_New": ""
			};
			switch (obj.event) {
			case 'btn-AddLine':
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);

			for (var i = 1; i <= option.data.length; i++) {
			$('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
			}
			form.render('select');
			form.render('checkbox');
			//å·æ°å¤éæ¡
			checkRefresh();
			break;
			@@ -275,6 +366,12 @@
			table.cache["mainTable"].push(JSON.parse(copyrow));//å°å¤å¶çè¡å¼ºè½¬æjsonè¿½å å°è¡¨æ ¼ä¸
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸

			for (var i = 1; i <= option.data.length; i++) {
			$('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
			}
			form.render('select');
			form.render('checkbox');
			//å·æ°å¤éæ¡
			checkRefresh();
			}
			@@ -286,37 +383,14 @@
			}
			});

			//éæ©éå®è®¢åå·æé®
			form.on('submit(btnHSeOrder)', function () {
			get_btnHSeOrder();
			});

			//éæ©ä¸å¡åæé®
			//éæ©åæ´äºº
			form.on('submit(btnHEmp)', function () {
			get_btnHEmp();
			});

			//éæ©å®¢æ·æé®
			form.on('submit(btnHCus)', function () {
			get_btnHCus();
			});

			//éæ©å·¥ä½ä¸å¿æé®
			form.on('submit(btnHCenter)', function () {
			get_btnHCenter();
			});


			//è¡éæ©å¤çï¼å·¥åºç±»åï¼
			form.on('select(HSTATUS)', 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.HSTATUS = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			//éæ©è´è´£é¨é¨
			form.on('submit(btnHDept)', function () {
			get_btnHDept();
			});

			//éåº
			@@ -338,47 +412,20 @@
			set_GridDelete(obj); //è¡åå é¤
			set_GridCellCheck(obj); //è¡åå¿«æ·é®çé

			//#region ä¿®æ¹è¡ æ¶é´

			var data = obj.data;
			//è®¡åå¼å§æ¥æ
			if (obj.event == 'HPlanBeginDate') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			//å·æ°å¤éæ¡
			checkRefresh();
			}
			});
			}

			//è®¡åå®å·¥æ¥æ
			if (obj.event == 'HPlanEndDate') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			//å·æ°å¤éæ¡
			checkRefresh();
			}
			});
			}

			//#endregion

			});

			//ç¶æ
			form.on('select(HBarCodeStatus_New)', 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.HBarCodeStatus_New = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});

			})

			//#endregion

			@@ -426,21 +473,13 @@
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HMaterNumber', title: 'ç©æç¼ç ', edit: 'text', event: "HMaterID" }
			, { field: 'HMaterName', title: 'ç©æåç§°' }
			, { field: 'HModel', title: 'è§æ ¼åå·' }
			, { field: 'HSourceID', title: 'HSourceID', hide: true }
			, { field: 'HSourceName', title: 'çäº§èµæº', edit: 'text', event: "HSourceID" }//f7
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'HDeptName', title: 'çäº§è½¦é´', edit: 'text', event: "HDeptID" }//f7
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'HUnitName', title: 'è®¡éåä½', edit: 'text', event: "HUnitID" }//f7
			, { field: 'HQty', title: 'æ°é', edit: 'text' }
			, { field: 'HSTATUS', title: 'ä¸å¡ç¶æ', templet: "#HSTATUS" }
			, { field: 'HPlanBeginDate', title: 'è®¡åå¼å·¥æ¥æ', event: 'HPlanBeginDate' }
			, { field: 'HPlanEndDate', title: 'è®¡åå®å·¥æ¥æ', event: 'HPlanEndDate' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			, { field: 'HBarCode', title: 'æ¡å½¢ç ', edit: 'text' }
			, { field: 'HRelationQty', title: 'å³èæ°é', edit: 'text' }
			, { field: 'HRelationMoney', title: 'å³èéé¢', edit: 'text' }
			, { field: 'HBarCodeStatus_Old', title: 'åç¶æ', templet: "#HBarCodeStatus_Old", hide: true }
			, { field: 'HBarCodeStatus_New', title: 'ç¶æ', templet: "#HBarCodeStatus_New" }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text' }//f7
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 80 }
			]]
			}

			@@ -448,15 +487,15 @@
			table.render(option);
			}

			//éå®è®¢å
			function get_btnHSeOrder() {
			//é¨é¨
			function get_btnHDept() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'éå®è®¢å'//æ é¢
			, title: 'é¨é¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html', 'yes']
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -465,9 +504,8 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HSeOrderInterID").val(checkStatus.data[0].hmainid);
			$("#HSeOrderBillNo").val(checkStatus.data[0].åæ®å·);
			$("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			$("#HDeptName").val(checkStatus.data[0].HName);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -475,13 +513,13 @@
			})
			}

			//ä¸å¡å
			//åæ´äºº
			function get_btnHEmp() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡å'//æ é¢
			, title: 'åæ´äºº'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			@@ -522,133 +560,7 @@

			//è¡åå é¤å¿«æ·é®
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ç©æåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HModel": checkStatus.data[0].HModel
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//çäº§èµæº
			if (obj.event == "HSourceID") {
			//æå¼äººåè¡¨ å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "çäº§èµæºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "HSourceName": checkStatus.data[0].çäº§èµæºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//çäº§è½¦é´
			if (obj.event == "HDeptID") {
			//æå¼äººåè¡¨ å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "çäº§è½¦é´åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HDeptID": checkStatus.data[0].HItemID
			, "HDeptName": checkStatus.data[0].HName
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//è®¡éåä½
			if (obj.event == "HUnitID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "è®¡éåä½åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../Baseset/åºç¡èµæ/Gy_UnitList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HUnitName": checkStatus.data[0].HName
			, "HUnitID": checkStatus.data[0].HItemID
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			obj.event = "";
			return false;
			}
			})
			}

			//å¤é å·æ°è¡¨æ ¼
			@@ -662,7 +574,7 @@
			form.render('select');
			}

			//ä¿åHMaker
			//ä¿å
			function set_AddNew(data) {

			var num = [];
			@@ -670,6 +582,18 @@
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			//if ($("#HBarCodeStatus_Old" + (i + 1)).val()) {
			// num[i].HBarCodeStatus_Old = $("#HBarCodeStatus_Old" + (i + 1)).val();
			//}
			if ($("#HBarCodeStatus_New" + (i + 1)).val()) {
			num[i].HBarCodeStatus_New = $("#HBarCodeStatus_New" + (i + 1)).val();
			}
			}

			for (let j = 0; j < num.length; j++) {
			if (num[j].HBarCodeStatus_New != HBarCodeStatusVal[j]) {
			num[j].HBarCodeStatus_Old = HBarCodeStatusVal[j]
			}
			}

			@@ -681,7 +605,7 @@
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sc_ICMOBill/ICMOBillEdit",
			url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/BarCodeStatusChangeBillEdit",
			async: true,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			@@ -706,68 +630,44 @@
			//ç¼è¾ é¡µé¢èµå¼
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "'";
			$.ajax({
			url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
			url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/cx",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "HInterID": linterid },
			success: function (d) {

			//$("#HPRDORGID").val(d.data[0].HPRDORGID);
			//ä¸»è¡¨
			form.val("formData", {
			"HBillNo": d.data[0].åæ®å·
			, "HInterID":d.data[0].hmainid
			, "HInterID": d.data[0].hmainid
			, "HDate": Format(new Date(d.data[0].æ¥æ), "yyyy-MM-dd")
			, "HSeOrderBillNo": d.data[0].æºååå·
			, "HSeOrderInterID": d.data[0].æºåä¸»åç
			, "HSeOrderEntryID": d.data[0].æºåååç
			, "HEmpID": d.data[0].HEmpID
			, "HEmpName": d.data[0].ä¸å¡å
			, "HCenterID": d.data[0].HCenterID
			, "HCenterName": d.data[0].å·¥ä½ä¸å¿
			, "HRemark": d.data[0].è¡¨å¤´å¤æ³¨
			, "HPlanQty": d.data[0].è®¡åçäº§æ°é
			, "HPRDORGID": d.data[0].HPRDORGID
			, "HEmpName": d.data[0].åæ´äºº
			, "HDeptName": d.data[0].è´è´£é¨é¨
			, "HBillStatus": d.data[0].åæ®ç¶æ
			, "HEmpID": d.data[0].HEmpID
			, "HDeptID": d.data[0].HDeptID
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < d.data.length; i++) {
			var HSTATUS = "";
			switch (d.data[i].ç¶æ) {
			case "è®¡å":
			HSTATUS = "1";
			break;
			case "è®¡åç¡®è®¤":
			HSTATUS = "2";
			break;
			case "ä¸è¾¾":
			HSTATUS = "3";
			break;
			case "å¼å·¥":
			HSTATUS = "4";
			break;
			case "å®å·¥":
			HSTATUS = "5";
			break;
			case "ç»æ¡":
			HSTATUS = "6";
			break;
			}
			rowdata.push(
			{
			"HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].äº§åä»£ç , "HMaterName": d.data[i].äº§ååç§°
			, "HModel": d.data[i].è§æ ¼åå·, "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].çäº§èµæº
			, "HDeptID": d.data[i].HDeptID, "HDeptName": d.data[i].çäº§è½¦é´, "HUnitID": d.data[i].HUnitID
			, "HUnitName": d.data[i].è®¡éåä½, "HQty": d.data[i].çäº§ä»»å¡åæ°é, "HSTATUS": HSTATUS
			, "HPlanBeginDate": Format(new Date(d.data[i].è®¡åå¼å·¥æ¥æ), "yyyy-MM-dd"), "HPlanEndDate": Format(new Date(d.data[i].è®¡åå®å·¥æ¥æ), "yyyy-MM-dd")
			"HRelationQty": d.data[i].å³èæ°é, "HRelationMoney": d.data[i].å³èéé¢, "HRemark": d.data[i].è¡¨ä½å¤æ³¨
			, "HBarCode": d.data[i].æ¡å½¢ç , "HBarCodeStatus_Old": d.data[i].åç¶æ, "HBarCodeStatus_New": d.data[i].æ°ç¶æ
			}
			)
			HBarCodeStatusVal.push(d.data[i].æ°ç¶æ);
			}
			option.data = rowdata;
			table.render(option);
			for (let j = 0; j < d.data.length; j++) {
			//$("#HBarCodeStatus_Old" + (j+1)).val(d.data[j].åç¶æ)
			$("#HBarCodeStatus_New" + (j + 1)).val(d.data[j].æ°ç¶æ)
			}
			form.render('select');
			}
			})