MES-WEB-LayUI.git

			@@ -102,11 +102,11 @@
			<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="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<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;">
			<!--<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>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -214,10 +214,10 @@
			<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; width: 150px; 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;">
			<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>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -446,7 +446,7 @@
			<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;">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width: 610px; background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -460,8 +460,9 @@
			</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 class="layui-input-inline">
			<input type="checkbox" name="isHBLFlag" id="isHBLFlag" value="false" lay-skin="primary" lay-filter="isHBLFlag">
			<input type="hidden" name="HBLFlag" id="HBLFlag" value="false" lay-skin="primary" lay-filter="HBLFlag">
			</div>
			</div>
			</div>
			@@ -481,8 +482,8 @@
			<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="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="HSeOrderEntryID" id="HSeOrderEntryID">
			<input type="hidden" class="layui-input" name="HSeOrderInterID" id="HSeOrderInterID">-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -717,8 +718,8 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<!--è¡ä¸æéæ©(æ¯å¦å§å¤)-->
			<script type="text/html" id="isEntrust">
			<select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
			<script type="text/html" id="HSupFlag">
			<select name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}">
			<option value="false">å¦</option>
			<option value="true">æ¯</option>
			</select>
			@@ -764,6 +765,10 @@

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

			$("#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"));

			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumn();
			@@ -787,7 +792,7 @@
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			@@ -797,6 +802,17 @@
			else if (OperationType == 2) {//ææºåæ°å¢
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			$("#HEntryID").val(HEntryID);//ä¿®æ¹æ¶åè¡¨ID

			//å¤æçäº§è®¢åæ¯å¦å®¡æ ¸
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/LEMS/ICMOBillCheck",
			data: { "hmainid": linterid, "HEntryID": HEntryID, "OrganizationID": sessionStorage["OrganizationID"] },
			async: false,
			success: function (result) {
			if (result.count == 0) { // è¯´æéªè¯æåäºï¼
			layer.alert(result.Message, { icon: 5 });
			} else {
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			@@ -829,12 +845,16 @@
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			}];
			table.render(option);
			}
			layer.closeAll("loading");
			}
			})
			}
			else if (OperationType == 3) {//ç¼è¾
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			@@ -867,21 +887,21 @@
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'HSupNumber', title: 'ä¾åºåä»£ç ', edit: 'text', event: "HSupCheck" }
			, { field: 'HSupName', title: 'ä¾åºå' }
			, { field: 'isEntrust', title: 'æ¯å¦å§å¤', templet: '#isEntrust' }
			, { field: 'HQty', title: 'æµæ°´å¡æ°é', edit: 'text' }
			, { field: 'HSupFlag', title: 'æ¯å¦å§å¤', templet: '#HSupFlag' }
			, { field: 'HQty', title: 'æµè½¬å¡æ°é', edit: 'text' }
			, { field: 'HOutPrice', title: 'å å·¥åä»·', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HRelationQty_In', title: 'è¿ç«æ°é', edit: 'text' }
			, { field: 'HRelationQty_Out', title: 'åºç«æ°é', edit: 'text' }
			, { field: 'HRelationQty_WWOrder', title: 'å§å¤å·¥åæ°é', edit: 'text' }
			, { field: 'HRelationQty_Bad', title: 'ä¸åæ ¼æ°é', edit: 'text' }
			, { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', edit: 'text', event: "HOverRate" }
			, { field: 'HMaxQty', title: 'æé«ä¸é', edit: 'text', edit: 'false', }
			, { field: 'HPassRate', title: 'è¯ç', edit: 'text' }
			, { field: 'HSumPassRate', title: 'ç´¯è®¡è¯ç', edit: 'text' }
			, { field: 'HPicNum', title: 'å¾çº¸ç¼å·', edit: 'text' }
			, { field: 'HProcCheckNote', title: 'æ¬å·¥åºç¡®è®¤è®°å½', edit: 'text', width: 500 }
			, { field: 'HTechnologyParameter', title: 'å·¥èºåæ°', edit: 'text', width: 1200 }
			, { field: 'HRelationQty_In', title: 'è¿ç«æ°é', style:"background-color: #e6e6e6" }
			, { field: 'HRelationQty_Out', title: 'åºç«æ°é', style: "background-color: #e6e6e6"}
			, { field: 'HRelationQty_WWOrder', title: 'å§å¤å·¥åæ°é', style: "background-color: #e6e6e6" }
			, { field: 'HRelationQty_Bad', title: 'ä¸åæ ¼æ°é', style: "background-color: #e6e6e6" }
			, { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', event: "HOverRate", style: "background-color: #e6e6e6"}
			, { field: 'HMaxQty', title: 'æé«ä¸é', style: "background-color: #e6e6e6" }
			, { field: 'HPassRate', title: 'è¯ç', style: "background-color: #e6e6e6" }
			, { field: 'HSumPassRate', title: 'ç´¯è®¡è¯ç', style: "background-color: #e6e6e6" }
			, { field: 'HPicNum', title: 'å¾çº¸ç¼å·', style: "background-color: #e6e6e6"}
			, { field: 'HProcCheckNote', title: 'æ¬å·¥åºç¡®è®¤è®°å½', width: 500, style: "background-color: #e6e6e6"}
			, { field: 'HTechnologyParameter', title: 'å·¥èºåæ°', width: 500, style: "background-color: #e6e6e6"}
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			option = {
			@@ -903,7 +923,7 @@
			var dataIndex = $cr.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TNDEX == dataIndex) {
			$cr.find('input').val(value.isEntrust);
			$cr.find('input').val(value.HSupFlag);
			}
			});
			});
			@@ -924,7 +944,7 @@
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			@@ -935,7 +955,7 @@
			option.data = table.cache["mainTable"];
			table.render(option);
			for (var i = 1; i <= option.data.length; i++) {
			$('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
			$('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
			}
			form.render('select');
			break;
			@@ -954,7 +974,7 @@
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸
			for (var i = 1; i <= option.data.length; i++) {
			$('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
			$('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
			}
			form.render('select');
			}
			@@ -1087,7 +1107,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1097,9 +1117,9 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HDeptName: checkStatus.data[0].HName
			HDeptName: checkStatus.data[0].é¨é¨åç§°
			, HDeptID: checkStatus.data[0].HItemID
			, HDeptNumber: checkStatus.data[0].HNumber
			, HDeptNumber: checkStatus.data[0].é¨é¨ä»£ç
			});
			layer.close(layer.index);
			}
			@@ -1135,6 +1155,19 @@
			, isEditValue: flagValue
			});
			}
			});

			$("#HQty").on("input", function (e) {
			//è·åinputè¾å¥çå¼
			if (parseInt(e.delegateTarget.value)> parseInt($("#HPlanQty").val())) {
			return layer.msg("æåæ°éä¸è½è¶è¿å¯æåæ°é!");
			}
			else {
			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["HQty"] = e.delegateTarget.value;
			}
			}
			table.render(option);
			});

			//çå¬ååæ ¼ç¼è¾ ååæ ¼ç¼è¾å åæ´
			@@ -1346,6 +1379,11 @@
			});
			});

			//è¡¥ææ è®°
			form.on('checkbox(isHBLFlag)', function (data) {
			$("#HBLFlag").val(data.elem.checked);
			});

			//è½¦é´å¼¹çª
			form.on('submit(HWorkShopList)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -1512,7 +1550,7 @@
			"HProcNo": data[i].å·¥åºå·, "HProcID": data[i].hprocid, "HProcNumber": data[i].å·¥åºä»£ç , "HProcName": data[i].å·¥åº, "HWorkRemark": data[i].è¡¨ä½å¤æ³¨,
			"HCenterID": data[i].HCenterID, "HCenterNumber": data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterName": data[i].å·¥ä½ä¸å¿åç§°,
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": data[i].HSupID, "HSupNumber": data[i].ä¾åºåä»£ç , "HSupName": data[i].ä¾åºå, "isEntrust": data[i].å§å¤æ è®° == 0 ? "false" : "true",
			"HSupID": data[i].HSupID, "HSupNumber": data[i].ä¾åºåä»£ç , "HSupName": data[i].ä¾åºå, "HSupFlag": data[i].å§å¤æ è®° == 0 ? "false" : "true",
			"HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].å·¥èºåæ°, "HPicNum": data[i].å¾çº¸ç¼å·, "HProcCheckNote": data[i].æ¬å·¥åºç¡®è®¤è®°å½
			@@ -1521,7 +1559,7 @@
			option.data = Tablerow;
			table.render(option);
			for (var i = 1; i <= data.length; i++) {
			$('#isEntrust' + i + '').find("option[value='" + (data[i - 1].å§å¤æ è®° == "0" ? "false" : "true") + "']").attr("selected", true);
			$('#HSupFlag' + i + '').find("option[value='" + (data[i - 1].å§å¤æ è®° == "0" ? "false" : "true") + "']").attr("selected", true);
			}
			form.render('select');
			},
			@@ -1581,7 +1619,7 @@
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥ä½ä¸å¿ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (sSubTable[i].isEntrust == "true") {
			if (sSubTable[i].HSupFlag == "true") {
			if (!sSubTable[i].HSupID) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼ä¾åºåä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -1590,8 +1628,8 @@
			}
			}
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			var HBLFlag = document.getElementById("HBLFlag").checked;
			HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//å°æ°ç»åå¹¶æåç¬¦ä¸²
			//var HBLFlag = data.field.HBLFlag;
			//HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//å°æ°ç»åå¹¶æåç¬¦ä¸²
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(sSubTable);
			var flag = "xz";
			@@ -1651,6 +1689,7 @@
			}
			})
			}


			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			@@ -1752,7 +1791,7 @@
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			@@ -1794,12 +1833,17 @@
			, "HEquipMentName": data.è®¾å¤åç§°
			, "HEquipMentID": data.HEquipMentID
			, "HProductNum": data.æåç¼å·
			, "HExplanation": data.è¡¥æåå
			, "HBLFlag": data.è¡¥ææ è®°
			, "HExplanation": data.æè¦

			, "HProjectNum": data.é¡¹ç®ç¼å·
			, "HVerNum": data.çæ¬
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HMateOutBatchNo": data.åææ¹æ¬¡
			, "HXTNumber": data.è¯ä½ç©æä»£ç
			, "HXTModel": data.è¯ä½è§æ ¼åå·
			, "HCusNumber": data.æºåå®¢æ·ä»£ç
			, "HRoutingBillID": data.HRoutingBillID
			, "RoutingBill": data.å·¥èºè·¯çº¿


			, "HWorkShopName": data.çäº§è½¦é´
			@@ -1818,13 +1862,15 @@
			, "HprocExQty": data.çäº§æ°é
			, "HKeyMaterID": data.å³é®ææ
			, "HICMOEntryID": data.HICMOEntryID


			, "HProdMaterCode": data.äº§åCODE
			, "HSeOrderBillNo": data.éå®è®¢åå·
			, "HSeOrderEntryID": data.HSeOrderEntryID
			, "HSeOrderInterID": data.HSeOrderInterID
			//, "HSeOrderEntryID": data.HSeOrderEntryID
			//, "HSeOrderInterID": data.HSeOrderInterID
			, "HCusShortName": data.å®¢æ·ç®ç§°
			, "HCusNeedMaterial": data.å®¢æ·è¦æ±æææå
			, "HPlanSendGoodsDate": data.é¢è®¡åºè´§æ¥æ
			, "HPlanSendGoodsDate": formatDate(data.é¢è®¡åºè´§æ¥æ)
			, "HProdMaterName": data.äº§ååç§°2
			, "HCusName": data.å®¢æ·åç§°
			, "HWorkRemark": data.çäº§å¤æ³¨
			@@ -1844,17 +1890,18 @@
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": formatDate(data.å¶åæ¥æ)
			, "HCheckDate": formatDate(data.å®¡æ ¸æ¥æ)
			, "HCloseDate": formatDate(data.å³éæ¥æ)
			, "HCheckDate": data.å®¡æ ¸äºº == "" ? "" : formatDate(data.å®¡æ ¸æ¥æ)
			, "HCloseDate": data.å³éäºº == "" ? "" : formatDate(data.å³éæ¥æ)
			, "HUpDater": data.ä¿®æ¹äºº
			, "HDeleteMan": data.ä½åºäºº
			, "HUpDateDate": formatDate(data.ä¿®æ¹æ¥æ)
			, "HDeleteDate": formatDate(data.ä½åºæ¥æ)
			, "HCusNumber": data.æºåå®¢æ·ç¼ç
			, "HUpDateDate": data.ä¿®æ¹äºº == "" ? "" : formatDate(data.ä¿®æ¹æ¥æ)
			, "HDeleteDate": data.ä½åºäºº == "" ? "" : formatDate(data.ä½åºæ¥æ)
			, "HPickLabel": data.åè£æ è¯
			, "HPickLabelNumber": data.åè£æ è¯ç¼ç

			});
			$("#HBLFlag").val(data.è¡¥ææ è®° ? "true" : "false");
			$("input[name='isHBLFlag']").prop("checked", data.è¡¥ææ è®°);//true:éä¸ false:ä¸éä¸
			form.render("checkbox");

			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -1888,6 +1935,10 @@
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);
			for (var i = 0; i < result.data.length; i++) {
			$('#HSupFlag' + (i + 1)).find("option[value='" + result.data[i].HSupFlag + "']").attr("selected", true);
			}
			form.render('select');

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			@@ -2067,7 +2118,9 @@
			$("#HPickLabelNumber").val(data.åè£æ è¯ç¼ç );
			$("#HXTNumber").val(data.è¯ä½ç©æä»£ç );
			$("#HXTModel").val(data.è¯ä½è§æ ¼åå·);
			$("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:éä¸ false:ä¸éä¸
			$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
			$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:éä¸ false:ä¸éä¸
			form.render("checkbox");
			btnHMaterID = data.hmaterid;

			$.ajax({
			@@ -2080,8 +2133,18 @@
			var hbillno = result.data[0].åæ®å·
			HLZQty = data.æµè½¬å¡æ°é;
			getRoutingBill(hbillno);
			} else {
			option.data = [{
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			}];
			table.render(option);
			}

			},
			error: function (result) {
			layer.close(index);
			@@ -2110,7 +2173,7 @@
			option.data = result.data;
			table.render(option);
			for (var i = 1; i <= option.data.length; i++) {
			$('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
			$('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
			}
			form.render('select');
			}
			@@ -2122,13 +2185,13 @@
			}

			//è¡éæ©å¤çï¼æ¯å¦å§å¤ï¼
			form.on('select(isEntrust)', function (data) {
			form.on('select(HSupFlag)', 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.isEntrust = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			value.HSupFlag = data.value;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});