MES-WEB-LayUI.git

			@@ -9,6 +9,7 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -53,6 +54,7 @@
			<button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">éåº</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align: center; padding: 10px 0;"><b>å·¥åºæ£éªå</b></h1>
			<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>
			@@ -687,6 +689,14 @@
			// }, function () { window.location.href = "../../user/login.html"; });
			//}

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "7507";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion


			/åºå®ä»£ç ï¼æ¯å¼ åæ®é½è¦begin/
			/* 1.æ æºåæ°å¢
			* 2.ææºåæ°å¢
			@@ -727,6 +737,9 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶ä¿åæé®ç¦ç¨

			$("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªåID
			$("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªå
			//è·åæå¤§åæ®å·
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -742,6 +755,9 @@
			});
			}
			else if (OperationType == 2) {
			$("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
			$("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);

			if (HICMOEntryID < 0 \|\| HICMOEntryID == "") {
			layer.alert("çäº§ä»»å¡åååç éè¯¯ï¼æ æ³å·¥åºæ£ï¼", { icon: 5 });
			$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶æ°å¢æé®ç¦ç¨
			@@ -1004,6 +1020,7 @@


			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			var rowIndex = Number($(obj.tr).attr("data-index"))+Number(1);
			if (event.key == "F7") {
			if (obj.event == 'HQCCheckItemID') //æ¨¡å·ä¿¡æ¯
			{
			@@ -1026,12 +1043,16 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			var HResult = checkStatus.data[0].é»è®¤ç»è®º == "åæ ¼" ? 1 : 2
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			æ£éªé¡¹ç®: checkStatus.data[0].åç§°
			, HQCCheckItemID: checkStatus.data[0].HItemID
			, HResult: HResult
			});
			$('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);

			form.render('select');
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -1373,7 +1394,7 @@
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HUnit": data[i].åä½åç§°, "HQCNote": data[i].æ£éªè®°å½, "HResult": 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,
			"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
			@@ -1383,14 +1404,13 @@

			}
			)
			console.log(data[i].ç®æ å¼);
			SummaryIndex.push(i.toString());
			}

			option.data = rowdata;
			table.render(option);
			for (let j = 0; j < data.length; j++) {
			$("#HResult" + (j + 1)).val(data[j].ç»è®º)
			$("#HResult" + (j + 1)).val(data[j].ç»è®º == "åæ ¼" ? 1 : 2)
			}
			for (let j = 0; j < data.length; j++) {
			$("#HAnalysisMethod" + (j + 1)).val(data[j].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[j].åææ¹æ³ == "å®éåæ" ? 2 : 3))
			@@ -1676,7 +1696,6 @@
			$("#HRejectQty").val(checkStatus.data[0].æç»æ°);
			$("#HUpLimit").val(checkStatus.data[0].ä¸éå¼);
			$("#HDownLimit").val(checkStatus.data[0].ä¸éå¼);

			option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
			option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].æ½æ ·æ¹æ¡åç§°;
			option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].æ½æ ·ç±»å;
			@@ -1737,7 +1756,7 @@
			//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			//}
			{
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["HResult"],
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®": 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": "",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			@@ -1999,6 +2018,7 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, height: 'full-50'
			, cellMinWidth: 150
			@@ -2016,8 +2036,8 @@
			//, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HQCNote', title: 'æ£éªè®°å½', edit: 'text' }
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text' }
			, { field: 'HMin', title: 'æå°å¼', edit: 'text' }
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text', totalRow: true}
			, { field: 'HMin', title: 'æå°å¼', edit: 'text', totalRow: true }
			, { field: 'HAvg', title: 'å¹³åå¼', edit: 'text', totalRow: true }
			//, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }

			@@ -2077,6 +2097,7 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, height: 'full-50'
			, cellMinWidth: 150
			, totalRow: true
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { field: 'HSEQ', title: 'åºå·' }
			@@ -2739,7 +2760,6 @@

			//#regionãèµå¼ä¸åæ¾ã
			function Assignment(nowindex, dataindex) {
			console.log(JSON.stringify(option.data));
			if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·