MES-WEB-LayUI.git

			@@ -116,7 +116,8 @@
			<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" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" 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;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -208,8 +209,8 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¤æç»è®º</label>
			<div class="layui-input-block">
			<input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="åæ ¼" checked>
			<input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="ä¸åæ ¼">
			<input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="åæ ¼" >
			<input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="ä¸åæ ¼" checked>
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			@@ -645,7 +646,6 @@
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
			<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
			<input type="hidden" name="HProcID" id="HProcID" value="1">
			</form>
			</div>
			</div>
			@@ -762,6 +762,7 @@
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var HICMOEntryID = params[params[3]];//æºååid
			var HEntryID = params[params[4]];//æºååid
			}
			/åºå®ä»£ç ï¼æ¯å¼ åæ®é½è¦begin/

			@@ -830,7 +831,7 @@
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationOutBill();
			}
			//å·¥åºæµè½¬å¡åè¡¨é¦æ£
			//å·¥åºæµè½¬å¡åè¡¨å·¥åºæ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			@@ -941,7 +942,7 @@
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			type: "GET",
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			if (result.count == 1) {
			@@ -1485,7 +1486,13 @@
			, "HBatchNo": data.æ¹å·
			, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
			, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
			, "HProcID": data.HProcID
			, "HProcName": data.HProcName
			});

			$("input[name=HCheckerResult][value=true]").prop("checked", data.å¤å®ç»è®º === "åæ ¼");
			$("input[name=HCheckerResult][value=false]").prop("checked", data.å¤å®ç»è®º === "ä¸åæ ¼");
			form.render();
			data = result.data;
			//åè¡¨ èµå¼
			var rowdata = [];
			@@ -1552,6 +1559,7 @@

			//è¡¨å¤´ä¿¡æ¯æ£éªæ¹æ¡å¼¹çª
			form.on('submit(btnSearchQCScheme)', function () {
			var HName = $("#HMaterName").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -1561,7 +1569,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html', 'yes'],
			content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html?OperationType=1&HName=' + HName +'', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1898,7 +1906,7 @@
			{
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["é»è®¤ç»è®º"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["éç¹æ£æ¥"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].ä¸éå¼, "HDownLimit": + data[i].ä¸éå¼, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å
			}
			@@ -2219,7 +2227,7 @@
			//, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HQCNote', title: 'æ£éªè®°å½', edit: 'text' }
			, { field: 'HInspectVal', title: 'æ£éªå¼' }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text' }
			, { field: 'HUpLimit', title: 'ä¸éå¼' }
			, { field: 'HDownLimit', title: 'ä¸éå¼' }
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text', totalRow: true}
			@@ -2357,10 +2365,10 @@
			}
			if (HQty > 0) {
			document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			}
			form.render('radio');
			}