MES-WEB-LayUI.git

			@@ -183,6 +183,12 @@
			<input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
			</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="HBatchNo" id="HBatchNo" style="">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 45%;">
			@@ -204,6 +210,23 @@
			<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="ä¸åæ ¼">
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			<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="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			</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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
			</div>
			</div>
			</div>
			@@ -348,13 +371,13 @@
			<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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
			</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="HSampleDamageQty" id="HSampleDamageQty" style="">
			<input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
			</div>
			</div>
			</div>
			@@ -854,6 +877,8 @@
			$("#HICMOEntryID").val(HICMOEntryID);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			$("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
			$("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			@@ -911,6 +936,7 @@

			//æ ¹æ®æºåidè·åæºåä¿¡æ¯(å·¥åºæµè½¬å¡)
			function LoadingInformation_ProcExchange() {
			$('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//çäº§èµæºæé®å¯ç¨
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			@@ -937,6 +963,9 @@
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			$("#HProcName").val(data.å½åå·¥åº);//
			$("#HBatchNo").val(data.æ¹å·);
			$("#HTakeSampleCheckBillNo").val(data.åæ®å·);
			$("#HTakeSampleCheckBillID").val(data.HInterID);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			@@ -958,8 +987,8 @@
			var NewRow = {
			"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": '',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			};
			switch (obj.event) {
			@@ -1383,7 +1412,7 @@
			var ajaxLoad = layer.load();
			var sWhere = " and hmainid=" + linterid;
			$.ajax({
			url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
			url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			@@ -1453,15 +1482,17 @@
			, "HShiftsID": data.HShiftsID
			, "HShiftsName": data.çæ¬¡åç§°
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			, "HBatchNo": data.æ¹å·
			, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
			, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
			});
			data = result.data;
			//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®": 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].æ£éªä»ªå¨, "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,
			@@ -1540,7 +1571,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HQCSchemeID").val(checkStatus.data[0].HItemID);
			$("#HQCSchemeID").val(checkStatus.data[0].hmainid);
			$("#HQCSchemeName").val(checkStatus.data[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -1865,9 +1896,9 @@
			//"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]["é»è®¤ç»è®º"],
			"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": "",
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "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].æ½æ ·ç±»å
			}
			@@ -2053,6 +2084,48 @@
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			//è¡¨å¤´ä¿¡æ¯å·¥åº
			form.on('submit(btnHProc)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			$("#HProcID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2120,8 +2193,8 @@
			rowdata = [{
			"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": '',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			}];
			option = {
			@@ -2135,6 +2208,7 @@
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
			, { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç ' }
			, { field: 'æ£éªé¡¹ç®', title: 'æ£éªé¡¹ç®', edit: 'text', event: 'HQCCheckItemID' }
			, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
			, { field: 'æ£éªä»ªå¨', title: 'æ£éªä»ªå¨', edit: 'text', event: 'HInspectInstruMentID' }
			@@ -2145,6 +2219,9 @@
			//, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HQCNote', title: 'æ£éªè®°å½', edit: 'text' }
			, { field: 'HInspectVal', title: 'æ£éªå¼' }
			, { field: 'HUpLimit', title: 'ä¸éå¼' }
			, { field: 'HDownLimit', title: 'ä¸éå¼' }
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text', totalRow: true}
			, { field: 'HMin', title: 'æå°å¼', edit: 'text', totalRow: true }
			, { field: 'HAvg', title: 'å¹³åå¼', edit: 'text', totalRow: true }
			@@ -2165,10 +2242,7 @@
			, { field: 'xxx', title: 'æ¯è¾ç¬¦', edit: 'text', hide: true }
			, { field: 'HUnitID', title: 'åä½ID', edit: 'text', hide: true }
			, { field: 'HUnit', title: 'åä½', edit: 'text', hide: true }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text', hide: true }
			, { field: 'HTargetVal', title: 'ç®æ å¼', edit: 'text', hide: true }
			, { field: 'HUpLimit', title: 'ä¸éå¼', edit: 'text', hide: true }
			, { field: 'HDownLimit', title: 'ä¸éå¼', edit: 'text', hide: true }
			, { field: 'HUpOffSet', title: 'ä¸åå·®', edit: 'text', hide: true }
			, { field: 'HDownOffSet', title: 'ä¸åå·®', edit: 'text', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 85 }
			@@ -2962,8 +3036,8 @@
			$("#HDownLimit").val(0);
			$("#HUpOffSet").val(0);
			$("#HDownOffSet").val(0);
			$("#HSampleDamageQty").val("")
			$("#HSampleQty").val("")
			$("#HSampleDamageQty").val("0")
			$("#HSampleQty").val("0")
			$("#HSampleQty2").val("")
			$("#HAcceptQty").val("0")
			$("#HInspectionLevel").val("")
			@@ -2973,7 +3047,7 @@
			$("#HSampleUnRightQty2").val("")
			$("#HAQL").val("")
			$("#HSamplingType").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty").val("0")
			$("#HInspectResultToSee").val("")
			$("#HInspectResultToSee2").val("")
			$("#HSampleUnRightQty").val("")
			@@ -3252,6 +3326,71 @@
			})
			}

			//æ ¹æ®çäº§èµæºæè å·¥åº æ¥è¯¢çäº§å·¥åä¿¡æ¯
			function get_ICMOBillStatusList() {
			var sWhere = "";
			var HProcID = $("#HProcID").val();
			var HSourceID = $("#HSourceID").val();
			var HProcExchInterID = $("#HProcExchInterID").val();

			if (HProcID != "0") {
			sWhere += " and HProcID=" + HProcID;
			}
			if (HSourceID != "0") {
			sWhere += " and HSourceID=" + HSourceID
			}

			sWhere += " and HSourceInterID=" + HProcExchInterID;

			$.ajax({
			url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			$("#HProcID").val(result.data[0]["HProcID"]);
			$("#HProcName").val(result.data[0]["å·¥åº"]);
			$("#HSourceID").val(result.data[0]["HSourceID"]);
			$("#HSourceName").val(result.data[0]["çäº§èµæº"]);

			} else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			}

			//åæ ·åæ¥è¯¢
			function get_QC_TakeSampleCheckBillList() {
			var HProcID = $("#HProcID").val();
			var HProcExchInterID = $("#HProcExchInterID").val();
			var sWhere = "";

			if (HProcID == "0" \|\| HProcID == "") {
			return layer.msg("è¯·éæ©å·¥åº!");
			}
			sWhere = " and å·¥åºæµè½¬å¡ä¸»åç ='" + HProcExchInterID + "' and HProcID=" + HProcID;
			$.ajax({
			url: GetWEBURL() + "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			$("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
			$("#HTakeSampleCheckBillNo").val(result.data[0]["åæ®å·"]);
			}
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			}

			//è·åä¸åæ ¼æ°æ»æ°
			function addUnRightQty() {
			//å¾ªç¯æ£éªå¼è¡¨æ ¼æ°æ®ï¼è·åä¸åæ ¼æ°é