MES-WEB-LayUI.git

			@@ -314,15 +314,21 @@
			<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">
			placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">SNç è®°å½</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN" 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;">
			id="HErrTreatment" placeholder="è¯·è¾å¥åå®¹"
			onmouseover="this.title=this.value" style="margin-top:10px;">
			</div>
			</div>
			</div>
			@@ -658,13 +664,9 @@
			<option value="=" selected="selected">=</option>
			<option value=">">></option>
			<option value=">=">>=</option>
			<option value="<">
			<< /option>
			<option value="<=">
			<=< /option>
			<option value="<>">
			<>
			</option>
			<option value="<"><</option>
			<option value="<="><=</option>
			<option value="<>"><></option>
			<option value="between">between</option>
			</select>
			</div>
			@@ -1495,7 +1497,7 @@
			"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": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
			};

			switch (obj.event) {
			@@ -1641,6 +1643,7 @@

			var HEntryID = $("#HEntryID").val() - 1;//æ°ç»ä¸æ
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			option.data[HEntryID].HCompareSymbol = selectValue;
			//å¤å®å¦ææ¯å®éåæ
			if (HAnalysisMethod == 2) {
			if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
			@@ -1705,6 +1708,7 @@
			$("#HTargetVal").val(option_Check[nowindex].ç®æ å¼);
			$("#HUpLimit").val(option_Check[nowindex].ä¸éå¼);
			$("#HDownLimit").val(option_Check[nowindex].ä¸éå¼);
			$("#HComparator").val(option_Check[nowindex].æ¯è¾ç¬¦)
			}

			//éä¸è¡æ¹åé¢è²
			@@ -1932,7 +1936,147 @@
			}
			});
			}
			if (obj.event === 'HQualityStdName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è´¨éæ ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_QualityStd.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HQualityStdID: checkStatus.data[0].HItemID,
			HQualityStdName: checkStatus.data[0].è´¨éæ ååç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HQualityStdID": OptionData[0].HItemID
			, "HQualityStdName": OptionData[0].è´¨éæ ååç§°
			})
			} else {
			layer.msg("è¯¥è´¨éæ åå·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}
			if (obj.event === 'HInspectMethodName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ£éªæ¹æ³åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectMethod.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HInspectMethodID: checkStatus.data[0].HItemID,
			HInspectMethodName: checkStatus.data[0].æ£éªæ¹æ³åç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HInspectMethodID": OptionData[0].HItemID
			, "HInspectMethodName": OptionData[0].æ£éªæ¹æ³åç§°
			})
			} else {
			layer.msg("è¯¥æ£éªæ¹æ³å·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}
			if (obj.event === 'HInspectBasisName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ£éªä¾æ®åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectBasis.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HInspectBasisID: checkStatus.data[0].HItemID,
			HInspectBasisName: checkStatus.data[0].æ£éªä¾æ®åç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HInspectBasisID": OptionData[0].HItemID
			, "HInspectBasisName": OptionData[0].æ£éªä¾æ®åç§°
			})
			} else {
			layer.msg("è¯¥æ£éªä»ªå¨å·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}

			obj.event = "";
			return false;
			@@ -2262,7 +2406,7 @@
			"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": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
			}];
			option = {
			elem: '#mainTable'
			@@ -2287,6 +2431,12 @@
			, { field: 'HResult', title: 'ç»è®º', templet: '#HResult', event: 'HResult' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			, { field: 'HKeyInspect', title: 'éç¹æ£æ¥', templet: '#HKeyInspect', unresize: false }
			, { field: 'HQualityStdID', title: 'è´¨éæ åID', edit: 'text', hide: true }
			, { field: 'HQualityStdName', title: 'è´¨éæ å', edit: 'text', event: 'HQualityStdName' }
			, { field: 'HInspectMethodID', title: 'æ£éªæ¹æ³ID', edit: 'text', hide: true }
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', edit: 'text', event: 'HInspectMethodName' }
			, { field: 'HInspectBasisID', title: 'æ£éªä¾æ®ID', edit: 'text', hide: true }
			, { field: 'HInspectBasisName', title: 'æ£éªä¾æ®', edit: 'text', event: 'HInspectBasisName' }
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text' }
			@@ -2309,7 +2459,7 @@
			, { field: 'HSampleUnRightQty', title: 'æ ·æ¬ä¸åæ ¼æ°', edit: 'text', hide: true }
			, { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
			, { field: 'HStatus', title: 'ç¶æ', edit: 'text', hide: true }
			, { field: 'xxx', title: 'æ¯è¾ç¬¦', edit: 'text', hide: true }
			, { field: 'HCompareSymbol', title: 'æ¯è¾ç¬¦'}
			, { field: 'HUnitID', title: 'åä½ID', edit: 'text', hide: true }
			, { field: 'HUnit', title: 'åä½', edit: 'text', hide: true }
			, { field: 'HTargetVal', title: 'ç®æ å¼', edit: 'text', hide: true }
			@@ -2797,7 +2947,7 @@
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			//HCompareSymbol: $("#HCompareSymbol").val(),
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnit: option.data[nowindex].HUnit,//åä½
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			@@ -2837,7 +2987,7 @@
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			//HCompareSymbol: $("#HCompareSymbol").val(),
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnit: option.data[nowindex].HUnit,//åä½
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			@@ -2917,6 +3067,7 @@
			$("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].ç®æ å¼ : "") : maindata[nowindex].HTargetVal);
			$("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].ä¸éå¼ : "") : maindata[nowindex].HUpLimit);
			$("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].ä¸éå¼ : "") : maindata[nowindex].HDownLimit);
			$("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].æ¯è¾ç¬¦ : "=") : maindata[nowindex].HCompareSymbol);
			$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
			$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
			$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
			@@ -3908,9 +4059,9 @@
			{
			"HQCCheckClassID": data[i]["HQCCheckClassID"], "æ£éªé¡¹ç®ç±»å«": 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": + data[i].ä¸éå¼, "HDownLimit": + data[i].ä¸éå¼, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HInspectVal": '', "HTargetVal": data[i].ç®æ å¼, "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].æ½æ ·ç±»å
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å, "HCompareSymbol": data[i].æ¯è¾ç¬¦, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].è´¨éæ å, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].æ£éªæ¹æ³, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].æ£éªä¾æ®
			}
			);
			SampleNum.push(data[0].æ ·æ¬é);
			@@ -3973,6 +4124,7 @@
			$("#HUpLimit").val(data[data.length - 1].ä¸éå¼);
			$("#HDownLimit").val(data[data.length - 1].ä¸éå¼);

			$("#HComparator").val(data[data.length - 1].æ¯è¾ç¬¦);

			if ($("#HEntryID").val() - 1 >= 0) {
			option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
			@@ -3987,6 +4139,7 @@
			option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].æç»æ°;
			option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HCompareSymbol = data[data.length - 1].æ¯è¾ç¬¦;
			}

			rowdata_Value = [];
			@@ -4171,6 +4324,7 @@
			, "HRightQty": data.åæ ¼æ°é
			, "HCheckQty": data.æ½æ ·æ°é
			, "HBadQty": data.ä¸åæ ¼æ°é
			, "HRemarkSN": data.HRemarkSN
			});

			data = result.data;
			@@ -4187,7 +4341,7 @@
			"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
			"HInspectVal": data[i].æ£æµå¼, "HTargetVal": data[i].ç®æ å¼, "HUpLimit": data[i].ä¸éå¼, "HDownLimit": data[i].ä¸éå¼, "HUpOffSet": data[i].ä¸åå·®, "HDownOffSet": data[i].ä¸åå·®, "HSampleDamageQty": data[i].æ ·æ¬ç ´åæ°,
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HSampleDamageQty": data[i].æ ·æ¬ç ´åæ°, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": 0, "HRejectQty": data[i].æç»æ°,
			"HStrictness": 0, "HSampleUnRightQty": data[i].æ ·æ¬ä¸åæ ¼æ°, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].æ½æ ·ç±»å, "HStrictness": data[i].ä¸¥æ ¼åº¦
			"HStrictness": 0, "HSampleUnRightQty": data[i].æ ·æ¬ä¸åæ ¼æ°, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].æ½æ ·ç±»å, "HStrictness": data[i].ä¸¥æ ¼åº¦, "HCompareSymbol": data[i].æ¯è¾ç¬¦, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].è´¨éæ å, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].æ£éªæ¹æ³, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].æ£éªä¾æ®

			}
			)
			@@ -4493,6 +4647,19 @@
			function GetInspectInstruMentValue(obj) {
			OptionData = obj;
			}
			//è´¨éæ å
			function GetQualityStdValue(obj) {
			OptionData = obj;
			}
			//æ£éªæ¹æ³
			function GetInspectMethodValue(obj) {
			OptionData = obj;
			}

			//æ£éªä¾æ®
			function GetInspectBasisValue(obj) {
			OptionData = obj;
			}
			</script>
			</body>

	WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html	203 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -988,7 +988,7 @@

			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
			url: GetWEBURL() + '/QC_ProcessCheckBill/get_ICMOBill',
			type: "GET",
			async: false,
			data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },