MES-WEB-LayUI.git

			@@ -190,6 +190,40 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" id="hidediv1">
			<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" value="">
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			<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="HInSpectQty" id="HInSpectQty" value="0">
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			<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="HRightQty" id="HRightQty" value="0">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" id="hidediv1">
			<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="HUnRightQty" id="HUnRightQty" value="0">
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			<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="HUnKnowQty" id="HUnKnowQty" value="0">
			</div>
			</div>
			</div>
			<div class="layui-row">
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 58%">
			@@ -352,13 +386,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" value="0" id="HSampleDamageQty" style="">
			</div>
			</div>
			</div>
			@@ -401,7 +435,7 @@
			<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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<!--<div class="layui-inline">
			@@ -1042,14 +1076,14 @@

			sWhere = " and hmainid = " + $("#HInterID").val();
			$.ajax({
			url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
			url: GetWEBURL() + "/QC_StockCheckBill/QC_StockCheckBillList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 0) {
			$.ajax({
			url: GetWEBURL() + "/DeltetQC_FirstPieceCheck",
			url: GetWEBURL() + "/QC_StockCheckBill/DeltetQC_StockCheckBill",
			type: "GET",
			async: false,
			data: { "HInterID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
			@@ -1185,7 +1219,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_CheckItem.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_CheckItem.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1225,7 +1259,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectInstruMent.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectInstruMent.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1275,7 +1309,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectValue.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectValue.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1372,16 +1406,20 @@
			//ä¿åæåä¸æ¬¡ç¹å»è¡çæ£éªå¼
			set_SaveValue($("#HEntryID").val());

			if ($("#HICMOQty").val() == "" \|\| $("#HICMOQty").val() <= 0) {
			layer.msg("ä»»å¡åæ°éä¸è½ä¸ºç©ºä¸ä¸è½å°äºçäº0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HProcExchQty").val() == "" \|\| $("#HProcExchQty").val() <= 0) {
			layer.msg("æµè½¬å¡æ°éä¸è½ä¸ºç©ºä¸ä¸è½å°äºçäº0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HICMOQty").val() == "" \|\| $("#HICMOQty").val() <= 0) {
			// layer.msg("ä»»å¡åæ°éä¸è½ä¸ºç©ºä¸ä¸è½å°äºçäº0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HProcExchQty").val() == "" \|\| $("#HProcExchQty").val() <= 0) {
			// layer.msg("æµè½¬å¡æ°éä¸è½ä¸ºç©ºä¸ä¸è½å°äºçäº0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if ($("#HFirstCheckEmp").val() == 0) {
			layer.msg("æ£éªåæªéæ©ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HBatchNo").val() == "") {
			layer.msg("æ¹æ¬¡å·ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			var sSubTable = table.cache['mainTable'];
			@@ -1394,6 +1432,7 @@
			if (sSubTable[i].HSampleSchemeID == '' \|\| sSubTable[i].HSampleSchemeID == null) {
			sSubTable[i].HSampleSchemeID = 0
			}
			sSubTable[i].HKeyInspect = sSubTable[i].HKeyInspect == true ? 1 : 0;
			if (sSubTable[i].HSampleQty == '' \|\| sSubTable[i].HSampleQty == null) {
			sSubTable[i].HSampleQty = 0
			}
			@@ -1412,6 +1451,9 @@
			if (sSubTable[i].HUnitID == '') {
			sSubTable[i].HUnitID = 0
			}
			}
			if (data.field.HICMOQty == "") {
			data.field.HICMOQty = 0;
			}
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			@@ -1504,6 +1546,11 @@
			, "HShiftsID": data.HShiftsID
			, "HShiftsName": data.çæ¬¡åç§°
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			, "HBatchNo": data.æ¹å·
			, "HInSpectQty": data.æ£éªæ°é
			, "HRightQty": data.åæ ¼æ°é
			, "HUnRightQty": data.ä¸åæ ¼æ°é
			, "HUnKnowQty": data.å¯çæ°é
			});
			$("input[name=HLastResult][value=true]").prop("checked", data.å¤å®ç»è®º === "åæ ¼");
			$("input[name=HLastResult][value=false]").prop("checked", data.å¤å®ç»è®º === "ä¸åæ ¼");
			@@ -1902,7 +1949,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html', 'yes'],
			content: ['../../è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBillList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1941,7 +1988,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html', 'yes'],
			content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -2019,7 +2066,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html?Htype=&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -2095,7 +2142,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -2126,6 +2173,7 @@

			//è¡¨å¤´ä¿¡æ¯æ£éªæ¹æ¡å¼¹çª
			form.on('submit(btnSearchQCScheme)', function () {
			var HProcName = $("#HProcName").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -2135,6 +2183,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			//content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '&HProcName=' + HProcName + '', 'yes'],
			content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			@@ -2343,10 +2392,10 @@
			}
			if (HQty > 0) {
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			}
			form.render('radio');
			}
			@@ -2621,21 +2670,19 @@
			$("#HDownLimit").val(0);
			$("#HUpOffSet").val(0);
			$("#HDownOffSet").val(0);
			$("#HSampleDamageQty").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty2").val("")
			$("#HSampleDamageQty").val("0")
			$("#HSampleQty").val("0")
			$("#HSampleQty2").val("0")
			$("#HAcceptQty").val("0")
			$("#HInspectionLevel").val("")
			$("#HRejectQty").val("")
			$("#HRejectQty").val("0")
			$("#HStrictness").val("")
			$("#HSampleUnRightQty").val("")
			$("#HSampleUnRightQty2").val("")
			$("#HSampleUnRightQty").val("0")
			$("#HSampleUnRightQty2").val("0")
			$("#HAQL").val("")
			$("#HSamplingType").val("")
			$("#HSampleQty").val("")
			$("#HInspectResultToSee").val("")
			$("#HInspectResultToSee2").val("")
			$("#HSampleUnRightQty").val("")
			$("#HUnitID").val("0")
			$("#HUnitName").val("")
			$("#HInspectValB").val("0")
			@@ -2797,10 +2844,8 @@
			$("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
			$("#HAQL").val(maindata[nowindex].HAQL);
			$("#HSamplingType").val(maindata[nowindex].HSamplingType);
			$("#HSampleQty").val(maindata[nowindex].HSampleQty);
			$("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
			$("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
			$("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
			$("#HUnitID").val(maindata[nowindex].HUnitID);
			$("#HUnitName").val(maindata[nowindex].HUnitName);
			$("#HInspectValB").val(maindata[nowindex].HInspectValB);