From d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 17:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 210 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 156 insertions(+), 54 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 7cd2cc3..51e3f9a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -194,7 +194,7 @@
<input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
- <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
+ <div class="layui-inline" style="margin-left:20px;">
<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>
@@ -808,36 +808,59 @@
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
- //鑷姩甯﹀嚭妫�楠屾柟妗�
- GetCheckItemID();
+
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�"))
+ {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
+
}
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationInBill();
- //鑷姩甯﹀嚭妫�楠屾柟妗�
- GetCheckItemID();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
}
//宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3793) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation3();
- //鑷姩甯﹀嚭妫�楠屾柟妗�
- GetCheckItemID();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
}
//鐢熶骇璁㈠崟鍒楄〃棣栨
else if (HSouceBillType == 3710) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ICMO();
- //鑷姩甯﹀嚭妫�楠屾柟妗�
- GetCheckItemID();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
}
//宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
- //鑷姩甯﹀嚭妫�楠屾柟妗�
- GetCheckItemID();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
}
else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
@@ -952,10 +975,10 @@
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
type: "GET",
async: false,
- data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+ data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -969,11 +992,16 @@
$("#HSourceName").val(data.鐢熶骇璧勬簮);
$("#HSourceID").val(data.HSourceID);
$("#HMaterID").val(data.HMaterID);
+ $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
$("#HMaterName").val(data.浜у搧鍚嶇О);
$("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
$("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
$("#HMainSourceInterID").val(data.hmainid);
$("#HICMOEntryID").val(data.HEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -1449,7 +1477,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HInSpectValueB: checkStatus.data[0].妫�娴嬪�煎悕绉�
+ HInSpectValueB: checkStatus.data[0].HItemID,
+ HInSpectValueB_Text: checkStatus.data[0].妫�娴嬪�煎悕绉�
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
@@ -1545,10 +1574,13 @@
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 ($("#HInspectValB").val() == "") {
+ $("#HInspectValB").val(0)
}
+ //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;
@@ -2087,7 +2119,7 @@
rowdata_Value = [];
for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
rowdata_Value.push({
- "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
});
}
option_Value.data = rowdata_Value;
@@ -2112,7 +2144,7 @@
//#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val();
+ var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
@@ -2134,13 +2166,14 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
for (let j = 1; j <= 5; j++) {
rowdata_Value.push({
- "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
});
}
//妫�楠岄」鐩�
@@ -2168,10 +2201,59 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ $("#HEntryID").val() - 1
+
+ //鎼哄甫鍑烘娊鏍锋柟妗�
+ ReturnSampleScheme(data);
}
}
})
+ }
+
+ //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+ function ReturnSampleScheme(data) {
+ $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+ $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+ $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+ $("#HAQL").val(data[data.length - 1].AQL);
+ $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+ $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+ //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+ $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+ $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+ 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].涓嬮檺鍊�;
+ }
+
+ rowdata_Value = [];
+ for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+
+ IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
}
//鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
@@ -2198,13 +2280,14 @@
"HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
}
);
- SampleNum.push(5);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
for (let j = 1; j <= 5; j++) {
rowdata_Value.push({
- "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
});
}
//妫�楠岄」鐩�
@@ -2304,7 +2387,10 @@
$("#HICMOInterID").val(checkStatus.data[0].hmainid);
$("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
$("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(checkStatus.data[0].HMaterID);
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -2567,6 +2653,7 @@
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
@@ -2618,20 +2705,21 @@
//鍒濆琛ㄦ牸鏁版嵁
rowdata_Value = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
}];
option_Value = {
elem: '#ValueTable'
//, toolbar: '#toolbarDemo_Value'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , height: 'full-50'
+ , height: 'full-370'
, cellMinWidth: 150
, totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
, { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
- , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+ , { field: 'HInSpectValueB', title: '妫�娴嬪�糏D锛堝畾鎬э級', edit: 'text', hide: true }
+ , { field: 'HInSpectValueB_Text', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
, { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text', totalRow: true }
, { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -2873,9 +2961,16 @@
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
- $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+ $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+ $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ }
+
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2900,7 +2995,7 @@
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
row_value.push({
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
});
}
//鍒锋柊妫�楠屽�艰〃鏍�
@@ -3544,17 +3639,17 @@
HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
HInspectResultToSee: '', //妫�楠岀粨鏋�
HInspectResultToSee2: '', //妫�楠岀粨鏋�2
- HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
- HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ //HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ //HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnitName: option.data[nowindex].HUnit, //鍗曚綅
HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
- HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ //HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
- HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
- HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
- HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
- HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
- HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ //HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ //HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ //HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ //HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ //HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
}
//if (option.data[0].HSampleSchemeID == 0) {
@@ -3604,9 +3699,9 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
- $("#HUpLimit").val(maindata[nowindex].HUpLimit);
- $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#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 );
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3629,7 +3724,7 @@
$("#HInspectValB").val(maindata[nowindex].HInspectValB);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
$("#HTargetValB").val(maindata[nowindex].HTargetValB);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+ //$("#HTargetVal").val(maindata[nowindex].HTargetVal);
$("#HUpLimit").val(maindata[nowindex].HUpLimit);
$("#HDownLimit").val(maindata[nowindex].HDownLimit);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3688,6 +3783,9 @@
}];
table.render(option_Value);
//layer.msg(result.code + result.Message, { icon: 5 });
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
}
}
})
@@ -4042,9 +4140,9 @@
//#region 銆愰殣钘忔娴嬪�煎瓧娈点��
function IsHide(HAnalysisMethod_Value) {
if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
- option_Value.cols[0][3].hide = false; //瀹氭��
- option_Value.cols[0][4].hide = true; //瀹氶噺
- option_Value.cols[0][5].hide = true; //鍏朵粬
+ option_Value.cols[0][4].hide = false; //瀹氭��
+ option_Value.cols[0][5].hide = true; //瀹氶噺
+ option_Value.cols[0][6].hide = true; //鍏朵粬
$("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
$("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -4056,9 +4154,9 @@
$('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
} else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
- option_Value.cols[0][4].hide = false; //瀹氶噺
- option_Value.cols[0][3].hide = true; //瀹氭��
- option_Value.cols[0][5].hide = true; //鍏朵粬
+ option_Value.cols[0][5].hide = false; //瀹氶噺
+ option_Value.cols[0][4].hide = true; //瀹氭��
+ option_Value.cols[0][6].hide = true; //鍏朵粬
$("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
$("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -4072,9 +4170,9 @@
} else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
- option_Value.cols[0][5].hide = false; //鍏朵粬
- option_Value.cols[0][3].hide = true; //瀹氭��
- option_Value.cols[0][4].hide = true; //瀹氶噺
+ option_Value.cols[0][6].hide = false; //鍏朵粬
+ option_Value.cols[0][4].hide = true; //瀹氭��
+ option_Value.cols[0][5].hide = true; //瀹氶噺
$('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
$('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
@@ -4239,6 +4337,7 @@
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
$("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
+ //甯﹀嚭妫�楠岄」鐩�佹娊鏍锋柟妗�
get_CheckItem();
} else {
layer.msg(result.code + result.Message, { icon: 5 });
@@ -4456,7 +4555,10 @@
$("#HICMOInterID").val(obj[0].hmainid);
$("#HICMOEntryID").val(obj[0].HEntryID);
$("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(obj[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(obj[0].HMaterID);
}
function GetProcExValue(obj) { //娴佽浆鍗�
--
Gitblit v1.9.1