MES-WEB-LayUI.git

			@@ -103,7 +103,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æºåç±»å</label>
			<label class="layui-form-label" style="width: 85px;">æºåç±»å<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<select name="HMainSourceBillType" id="HMainSourceBillType">
			<option value="1102" selected>éè´è®¢å</option>
			@@ -113,7 +113,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æºååå·</label>
			<label class="layui-form-label" style="width: 85px;">æºååå·<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HMainSourceBillNo"
			id="HMainSourceBillNo"
			@@ -229,24 +229,24 @@
			<label class="layui-form-label" style="width: 85px;">æ£éªSN</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN"
			style="display: inline-block;">
			style="display: inline-block;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"
			style="width: 85px;padding: 9px 18px;">äº§åä»£ç </label>
			style="width: 85px;padding: 9px 18px;">äº§åä»£ç <label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HMaterNumber"
			id="HMaterNumber" value=""
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			id="HMaterNumber" value=""
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID"
			value="0"
			style="background-color:#efefef4d;width: 60%;display: none;"
			readonly>
			value="0"
			style="background-color:#efefef4d;width: 60%;display: none;"
			readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button"
			lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
			style="padding: 0 10px;float: right;margin-right: 3px;">
			lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
			style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			@@ -255,42 +255,49 @@
			<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="HMaterName" id="HMaterName"
			style="background-color:#efefef4d;display: inline-block;" readonly>
			style="background-color:#efefef4d;display: inline-block;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"
			style="width: 85px;padding: 9px 18px;">æ£éªå</label>
			style="width: 85px;padding: 9px 18px;">æ£éªå<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HFirstCheckEmpName"
			id="HFirstCheckEmpName"
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			id="HFirstCheckEmpName"
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			<input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp"
			value="0">
			value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button"
			lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
			id="btnSearchHFirstCheckEmp"
			style="padding: 0 10px;float: right;margin-right: 3px;">
			lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
			id="btnSearchHFirstCheckEmp"
			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>
			style="width: 85px;padding: 9px 18px;">æ£éªæ¹æ¡<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HQCSchemeName"
			id="HQCSchemeName"
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			id="HQCSchemeName"
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			readonly>
			<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button"
			lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
			style="padding: 0 10px;float: right;margin-right: 3px;">
			lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
			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: 120px;">
			<input type="text" class="layui-input" name="HQty" id="HQty"
			style="background-color:#efefef4d;" readonly value="0">
			</div>
			</div>
			</div>
			@@ -311,7 +318,7 @@
			</div>
			<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
			<label class="layui-form-label"
			style="width: 85px;padding: 9px 18px;">å·¥åº</label>
			style="width: 85px;padding: 9px 18px;">å·¥åº<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HProcName" id="HProcName"
			style="background-color:#efefef4d;width: 60%;display: inline-block;"
			@@ -2475,6 +2482,7 @@

			},
			success: function (layero, index) {
			btnSearchCheckSampleScheme

			}
			});
			@@ -2482,6 +2490,8 @@

			//è¡¨ä½ä¿¡æ¯æ½æ ·æ¹æ¡å¼¹çª
			form.on('submit(btnSearchCheckSampleScheme)', function () {
			var nowindex = $("#HEntryID").val()-1;
			var inspectMethod = table.cache["mainTable"][nowindex].HAnalysisMethod;
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -2491,7 +2501,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_SampleSchemeListView.html', 'yes'],
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_SampleSchemeListView.html?', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -2558,7 +2568,7 @@

			//#region ãéæ£éªæ¹æ¡è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯ã
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
			var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			@@ -2582,6 +2592,7 @@
			"HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["æ£éªæ¹æ³"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["æ£éªä¾æ®"],
			}
			);

			SampleNum.push(data[0].æ ·æ¬é);
			}

			@@ -3149,7 +3160,7 @@
			, { field: 'HQualityStdName', title: 'è´¨éæ å', edit: 'text', event: "HQualityStdID" },

			, { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', edit: 'text', event: "HInspectMethodID" },
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', edit: 'text', event: "HInspectMethodID", style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'},

			, { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
			, { field: 'HInspectBasisName', title: 'æ£éªä¾æ®', edit: 'text', event: "HInspectBasisID" },
			@@ -4317,12 +4328,14 @@
			var HEntryID = $("#HEntryID").val() - 1;//æ°ç»ä¸æ
			if (UnRightQty > HAcceptQty) {
			$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //ä¸åæ ¼
			table.cache["mainTable"][HEntryID].HResult = 2
			$("#HInspectResultToSee").val('ä¸åæ ¼');
			$("#HInspectResultToSee2").val('ä¸åæ ¼');
			$("#HInspectResultToSee").css("background-color", "#F0D6E3");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			} else {
			$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //åæ ¼
			table.cache["mainTable"][HEntryID].HResult = 1
			$("#HInspectResultToSee").val('åæ ¼');
			$("#HInspectResultToSee2").val('åæ ¼');
			$("#HInspectResultToSee").css("background-color", "#CEE3F2");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			@@ -4934,6 +4947,7 @@
			$("#HMainSourceEntryID").val(res.data[0].HEntryID)
			$("#HQCSchemeName").val(res.data[0].æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(res.data[0].æ£éªæ¹æ¡ID);
			$("#HQty").val(res.data[0].å®æ¶æ°é);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			}