MES-WEB-LayUI.git

			@@ -74,7 +74,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="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
			<input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -86,7 +86,7 @@
			</button>
			<input type="hidden" name="HSourceID" id="HSourceID" value="0">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -173,12 +173,28 @@
			<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
			</div>
			</div>
			<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="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" 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="HShiftsID" id="HShiftsID" value="0">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 50%;">
			<div class="layui-inline" style="width: 45%;">
			<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="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%">
			<label class="layui-form-label" style="width: 85px;">å¼å¸¸ä¸´æ¶<br />å¤çæ¹æ¡</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="margin-top:10px;">
			</div>
			</div>
			</div>
			@@ -738,8 +754,8 @@
			$("#HBillNo").val("");
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶ä¿åæé®ç¦ç¨

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

			if (HICMOEntryID < 0 \|\| HICMOEntryID == "") {
			layer.alert("çäº§ä»»å¡åååç éè¯¯ï¼æ æ³å·¥åºæ£ï¼", { icon: 5 });
			@@ -790,7 +806,13 @@
			} else if (HSouceBillType == 3791) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationOutBill();
			} else {
			}
			//å·¥åºæµè½¬å¡åè¡¨é¦æ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			}
			else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			}
			}
			@@ -886,6 +908,48 @@
			}
			});
			}

			//æ ¹æ®æºåidè·åæºåä¿¡æ¯(å·¥åºæµè½¬å¡)
			function LoadingInformation_ProcExchange() {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			type: "GET",
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			if (result.count == 1) {
			$("#HProcExchBillNo").val(data.åæ®å·);
			$("#HProcExchInterID").val(data.HInterID);
			$("#HProcExchEntryID").val(data.HProcExchEntryID == null ? 0 : data.HProcExchEntryID);//
			$("#HProcExchQty").val(data.æµè½¬å¡æ°é);
			$("#HICMOBillNo").val(data.ä»»å¡å);
			$("#HICMOInterID").val(data.HICMOInterID);
			$("#HICMOQty").val(data.HICMOQty == null ? 0 : data.HICMOQty);//
			$("#HSourceName").val(data.çäº§èµæº);//
			$("#HSourceID").val(data.HSourceID == null ? 0 : data.HSourceID);//
			$("#HMaterID").val(data.HMaterID);
			$("#HMaterName").val(data.äº§ååç§°);
			$("#HMainSourceBillNo").val(data.åæ®å·);
			$("#HMainSourceBillType").val(data.HBillType);
			$("#HMainSourceInterID").val(data.HInterID);
			$("#HICMOEntryID").val(data.HICMOEntryID == null ? 0 : data.HICMOEntryID);//
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			$("#HProcName").val(data.å½åå·¥åº);//
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			@@ -1219,7 +1283,7 @@
			//ä¿å
			function set_SaveBill(data) {
			//èµå¼æåä¸ä¸ªéä¸è¡çæ°æ®ç»option.data
			Assignment(LastIndex, LastIndex);
			//Assignment(LastIndex, LastIndex);
			//ä¿åæåä¸æ¬¡ç¹å»è¡çæ£éªå¼
			set_SaveValue($("#HEntryID").val());

			@@ -1269,6 +1333,7 @@
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sSubValue = JSON.stringify(table.cache['ValueTable']);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;

			var index = layer.load();
			$.ajax({
			type: "POST",
			@@ -1385,6 +1450,9 @@
			, "HEntryID": data.hsubid
			, "HQCCheckItemName": data.æ£éªé¡¹ç®åç§°
			, "HQCCheckItemID": data.HQCCheckItemID
			, "HShiftsID": data.HShiftsID
			, "HShiftsName": data.çæ¬¡åç§°
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			});
			data = result.data;
			//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
			@@ -1475,6 +1543,44 @@
			$("#HQCSchemeID").val(checkStatus.data[0].HItemID);
			$("#HQCSchemeName").val(checkStatus.data[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			//è¡¨å¤´ä¿¡æ¯çäº§çæ¬¡å¼¹çª
			form.on('submit(btnHShifts)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çäº§çæ¬¡åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.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('è¯·éæ©æ°æ®');
			}
			$("#HShiftsName").val(checkStatus.data[0].çæ¬¡åç§°);
			$("#HShiftsID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -1696,18 +1802,21 @@
			$("#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].æ½æ ·ç±»å;
			option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].æ£éªæ°´å¹³;
			option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].ä¸¥æ ¼åº¦;
			option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
			option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].åè®¸æ°;
			option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].æç»æ°;
			option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].ä¸éå¼;

			if ($("#HEntryID").val() - 1 >= 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].æ½æ ·ç±»å;
			option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].æ£éªæ°´å¹³;
			option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].ä¸¥æ ¼åº¦;
			option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
			option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].åè®¸æ°;
			option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].æç»æ°;
			option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].ä¸éå¼;
			}

			rowdata_Value = [];
			for (let i = 1; i <= checkStatus.data[0].æ ·æ¬é; i++) {
			@@ -3378,49 +3487,49 @@

			//æ£éªå¼ä¿å
			function set_SaveValue(dataindex) {
			//if (OperationType == 3) {
			// EchoValue();
			//}
			if (OperationType == 3) {
			EchoValue();
			}

			//for (let i = 0; i < table.cache['ValueTable'].length; i++) {
			// if (table.cache['ValueTable'][i].HInSpectValueB == "" \|\| table.cache['ValueTable'][i].HInSpectValueB == null) {
			// table.cache['ValueTable'][i].HInSpectValueB = 0
			// }
			// if (table.cache['ValueTable'][i].HInSpectValueT == "" \|\| table.cache['ValueTable'][i].HInSpectValueT == null) {
			// table.cache['ValueTable'][i].HInSpectValueT = 0
			// }
			// if (table.cache['ValueTable'][i].HInSpectValue == "" \|\| table.cache['ValueTable'][i].HInSpectValue == null) {
			// table.cache['ValueTable'][i].HInSpectValue = 0
			// }
			//}
			//var sValueTable = JSON.stringify(table.cache['ValueTable']);
			//var HInterID = $("#HInterID").val();
			//var HEntryID = dataindex;
			for (let i = 0; i < table.cache['ValueTable'].length; i++) {
			if (table.cache['ValueTable'][i].HInSpectValueB == "" \|\| table.cache['ValueTable'][i].HInSpectValueB == null) {
			table.cache['ValueTable'][i].HInSpectValueB = 0
			}
			if (table.cache['ValueTable'][i].HInSpectValueT == "" \|\| table.cache['ValueTable'][i].HInSpectValueT == null) {
			table.cache['ValueTable'][i].HInSpectValueT = 0
			}
			if (table.cache['ValueTable'][i].HInSpectValue == "" \|\| table.cache['ValueTable'][i].HInSpectValue == null) {
			table.cache['ValueTable'][i].HInSpectValue = 0
			}
			}
			var sValueTable = JSON.stringify(table.cache['ValueTable']);
			var HInterID = $("#HInterID").val();
			var HEntryID = dataindex;

			//var msg = sValueTable + ";" + HInterID + ";" + HEntryID
			var msg = sValueTable + ";" + HInterID + ";" + HEntryID

			//var index = layer.load();
			//$.ajax({
			// type: "POST",
			// url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
			// async: true,
			// data: { "msg": msg },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) {
			// layer.close(index);
			// //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®
			// }
			// else {
			// layer.close(index);
			// layer.msg("æ£éªå¼ä¿åéè¯¯ï¼" + data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// },
			// error: function (err) {
			// layer.close(index);
			// layer.msg("æ£éªå¼ä¿åéè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			//});
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
			async: true,
			data: { "msg": msg },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.close(index);
			//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®
			}
			else {
			layer.close(index);
			layer.msg("æ£éªå¼ä¿åéè¯¯ï¼" + data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("æ£éªå¼ä¿åéè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//#regionãéèæ£æµå¼åæ®µã