From 727ee25aeb5fcaf84e2cf009b2eacd3a86bcb3ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十一月 2024 12:55:23 +0800
Subject: [PATCH] 新增 环境检测方案,环境检测单
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 71 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 580db9d..d8cd76e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -116,7 +116,8 @@
<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="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -208,8 +209,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<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="涓嶅悎鏍�">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" >
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
</div>
</div>
<div class="layui-inline" id="hidediv1">
@@ -645,7 +646,6 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
- <input type="hidden" name="HProcID" id="HProcID" value="1">
</form>
</div>
</div>
@@ -762,6 +762,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -830,7 +831,7 @@
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationOutBill();
}
- //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ //宸ュ簭娴佽浆鍗″垪琛ㄥ伐搴忔
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
@@ -941,7 +942,7 @@
$.ajax({
url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -1304,6 +1305,46 @@
}
});
+
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ //var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ //var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : value;
+
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
@@ -1485,9 +1526,14 @@
, "HBatchNo": data.鎵瑰彿
, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
});
+
+ $("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
+ $("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
+ form.render();
data = result.data;
- //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < data.length; i++) {
@@ -1553,6 +1599,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1562,7 +1609,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName +'', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1899,7 +1946,7 @@
{
"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": "0",
+ "HInspectVal": '', "HTargetVal": '', "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].鎶芥牱绫诲瀷
}
@@ -2220,7 +2267,7 @@
//, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HInspectVal', title: '妫�楠屽��' }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true}
@@ -2358,10 +2405,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
--
Gitblit v1.9.1