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/

			@@ -771,6 +772,10 @@
			//var HSouceBillType = 3722;
			////var HICMOEntryID = 100027;
			//var HICMOEntryID = "";

			//åå§åè¡¨æ ¼
			set_InitGrid();

			//å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			$("#HInterID").val("");
			@@ -826,14 +831,20 @@
			if (HSouceBillType == 3722 \|\| HSouceBillType == 4610) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation2();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			} else if (HSouceBillType == 3791) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationOutBill();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºæµè½¬å¡åè¡¨é¦æ£
			//å·¥åºæµè½¬å¡åè¡¨å·¥åºæ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			@@ -846,9 +857,7 @@
			}

			$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//ç¦ç¨æ£éªé¡¹ç®æ¾å¤§é

			//åå§åè¡¨æ ¼
			set_InitGrid();


			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			function LoadingInformation2() {
			@@ -856,6 +865,7 @@
			$.ajax({
			url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
			success: function (result) {
			if (result.code == 1) {
			@@ -900,6 +910,7 @@
			$.ajax({
			url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -941,7 +952,8 @@
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			type: "GET",
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			async: false,
			data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			if (result.count == 1) {
			@@ -985,7 +997,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨ä»£ç ": "","æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			@@ -1181,6 +1193,7 @@

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			æ£éªä»ªå¨ä»£ç : checkStatus.data[0].æ£éªä»ªå¨ä»£ç ,
			æ£éªä»ªå¨: checkStatus.data[0].æ£éªä»ªå¨åç§°
			, HInspectInstruMentID: checkStatus.data[0].HItemID
			});
			@@ -1303,6 +1316,49 @@
			break;
			}
			});


			table.on('edit(mainTable)', function (obj) {
			var cell = $(this);
			var rowIndex = cell.closest('tr').data('index'); // è·åå½åè¡æ°æ®ç´¢å¼
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ
			var HInspectVal = $("#HInspectVal").val(); //æ£éªå¼
			//var HTargetVal = $("#HTargetVal").val(); //ç®æ å¼
			//var HComparator = $("#HComparator").val(); //æ¯è¾ç¬¦
			var HEntryID = rowIndex;
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //ä¸éå¼
			var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //ä¸éå¼
			switch (field) {
			case "HInspectVal": //æ£éªå¼
			value = isNaN(value) ? 0 : parseFloat(value);

			if (HAnalysisMethod == "2") {
			if (value <= HUpLimit && value >= HDownLimit) {
			obj.update({
			"HResult": "1"
			});

			$('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);

			} else {
			obj.update({
			"HResult": "2"
			});

			$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
			}
			form.render('select');
			LastResult();
			}
			break;
			}
			});


			//ä¿åæé®
			form.on('submit(btnSave)', function (data) {
			@@ -1485,14 +1541,20 @@
			, "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("radio");
			data = result.data;
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨ä»£ç ": data[i].æ£éªä»ªå¨ä»£ç ,"æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HUnit": data[i].åä½åç§°, "HQCNote": data[i].æ£éªè®°å½, "HResult": data[i].ç»è®º == "åæ ¼" ? 1 : 2,
			"HMax": data[i].æå¤§å¼, "HMin": data[i].æå°å¼, "HAvg": data[i].å¹³åå¼, "HRemark": data[i].è¡¨ä½å¤æ³¨,
			"HAnalysisMethod": data[i].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[i].åææ¹æ³ == "å®éåæ" ? 2 : 3), "HKeyInspect": data[i].éç¹æ£æ¥ == "å¦" ? false : true,
			@@ -1552,6 +1614,7 @@

			//è¡¨å¤´ä¿¡æ¯æ£éªæ¹æ¡å¼¹çª
			form.on('submit(btnSearchQCScheme)', function () {
			var HName = $("#HMaterName").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -1561,7 +1624,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) {

			@@ -1874,7 +1937,7 @@
			});
			//#endregion

			window.get_CheckItem = function() {
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			@@ -1896,9 +1959,9 @@
			//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			//}
			{
			"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]["é»è®¤ç»è®º"],
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨ä»£ç ": data[i]["æ£éªä»ªå¨ä»£ç "], "æ£éªä»ªå¨": 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].æ½æ ·ç±»å
			}
			@@ -2086,6 +2149,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2126,6 +2190,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2163,6 +2228,7 @@
			}
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			GetCheckItemID();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2191,7 +2257,7 @@
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§è¡¨æ ¼æ°æ®
			rowdata = [{
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨ä»£ç ": "","æ£éªä»ªå¨": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			@@ -2211,6 +2277,11 @@
			, { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç ' }
			, { field: 'æ£éªé¡¹ç®', title: 'æ£éªé¡¹ç®', edit: 'text', event: 'HQCCheckItemID' }
			, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
			, {
			field: 'æ£éªä»ªå¨ä»£ç ', title: 'æ£éªä»ªå¨ä»£ç ', totalRow: true, templet: function (d) {
			return '<span style="color: blue;" lay-event="æ£éªä»ªå¨ä»£ç ">' + d.æ£éªä»ªå¨ä»£ç + '</span>';
			}, style: 'cursor: pointer;'
			}
			, { field: 'æ£éªä»ªå¨', title: 'æ£éªä»ªå¨', edit: 'text', event: 'HInspectInstruMentID' }
			, { field: 'HResult', title: 'ç»è®º', templet: '#HResult' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			@@ -2219,7 +2290,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 +2428,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');
			}
			@@ -2530,7 +2601,9 @@
			}

			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if ($("#HSampleSchemeID").val() != "0") {
			Assignment(nowindex, dataindex);
			}
			if (isHavingCount == false && OperationType != 3) {
			var row_value = [];
			for (let i = 0; i < SampleNum[nowindex]; i++) {
			@@ -3778,6 +3851,28 @@
			}
			//#endregion

			//èªå¨å¸¦åºæ£éªé¡¹ç®
			function GetCheckItemID() {
			var HName = $("#HMaterName").val();
			var HProName = $("#HProcName").val();
			if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemID",
			type: "GET",
			async: false,
			data: { "HName": HName, "HProName": HProName },
			success: function (result) {
			if (result.code == 1) {
			$("#HQCSchemeID").val(result.data[0].hmainid);
			$("#HQCSchemeName").val(result.data[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			} else {
			layer.msg(result.code + result.Message, { icon: 5 });
			}
			}
			})
			}
			}
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			@@ -3811,6 +3906,7 @@
			$("#HMaterNumber").val(obj[0].ç©æä»£ç );
			$("#HMaterName").val(obj[0].ç©æåç§°);
			$("#HMaterID").val(obj[0].HItemID);
			GetCheckItemID();
			}

			function GetHEmpValue(obj) { //è´¨æ£å