From 6b8a9aef84d4d4ba8dd08b911ade7cfa6cc4fa4a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 26 一月 2024 16:51:07 +0800
Subject: [PATCH] 周总结
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 508 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 315 insertions(+), 193 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 040b521..844410d 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"
@@ -115,7 +115,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <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;">
@@ -129,6 +129,12 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ </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="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
</div>
</div>
</div>
@@ -667,6 +673,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
+ debugger;
var rowdata = [];
var option = [];
@@ -681,6 +688,8 @@
var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+ var editIndex = 0;//缂栬緫涓嬫爣
+ var SampleNum = [];//鏍锋湰鏁伴噺
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -708,6 +717,10 @@
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
@@ -731,6 +744,9 @@
$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -803,8 +819,9 @@
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(data.HICMOEntryID);
- $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HProcName").val(data.褰撳墠宸ュ簭);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -857,7 +874,7 @@
});
}
- //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅銆愭姤宸ュ彴妫�楠屻��
function LoadingInformation2() {
var wait = layer.load();
$.ajax({
@@ -882,6 +899,11 @@
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(data.HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -938,7 +960,7 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
@@ -1085,7 +1107,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1101,7 +1122,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1116,6 +1136,7 @@
}
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
if (obj.event == 'HQCCheckItemID') {
//椤甸潰灞�-鑷畾涔�
@@ -1137,12 +1158,15 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+ var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
, HQCCheckItemID: checkStatus.data[0].HItemID
+ , HResult: HResult
});
+ $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+ form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1332,22 +1356,22 @@
layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (sSubTable[i].HSampleSchemeID == '') {
+ if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
sSubTable[i].HSampleSchemeID = 0
}
- if (sSubTable[i].HSampleQty == '') {
+ if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
sSubTable[i].HSampleQty = 0
}
- if (sSubTable[i].HSampleDamageQty == '') {
+ if (sSubTable[i].HSampleDamageQty == '' || sSubTable[i].HSampleDamageQty == null) {
sSubTable[i].HSampleDamageQty = 0
}
- if (sSubTable[i].HAcceptQty == '') {
+ if (sSubTable[i].HAcceptQty == '' || sSubTable[i].HAcceptQty == null) {
sSubTable[i].HAcceptQty = 0
}
- if (sSubTable[i].HRejectQty == '') {
+ if (sSubTable[i].HRejectQty == '' || sSubTable[i].HRejectQty == null) {
sSubTable[i].HRejectQty = 0
}
- if (sSubTable[i].HSampleUnRightQty == '') {
+ if (sSubTable[i].HSampleUnRightQty == '' || sSubTable[i].HSampleUnRightQty == null) {
sSubTable[i].HSampleUnRightQty = 0
}
if (sSubTable[i].HUnitID == '') {
@@ -1472,25 +1496,24 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"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
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
+
}
)
- console.log(rowdata[i].HSampleQty);
SummaryIndex.push(i.toString());
}
option.data = rowdata;
- console.log(rowdata);
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
@@ -1778,6 +1801,19 @@
$("#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].涓嬮檺鍊�;
+
rowdata_Value = [];
for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
rowdata_Value.push({
@@ -1805,28 +1841,44 @@
//#region銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
function get_CheckItem() {
+ var HBatchQty = $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
success: function (result) {
if (result.code == 1) {
var rowdata = [];
var data = result.data;
+ rowdata_Value = [];
for (var i = 0; i < result.data.length; i++) {
//瀛愯〃 璧嬪��
- rowdata.push({
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
- });
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": 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": "",
+ "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].鎶芥牱绫诲瀷
+ }
+ );
+ SampleNum.push(5);
}
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= 5; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ //妫�楠岄」鐩�
option.data = rowdata;
table.render(option);
-
+ //妫�楠屽��
+ option_Value.data = rowdata_Value;
+ //console.log(JSON.stringify(option_Value.data));
+ table.render(option_Value);
+ //================================================
for (var i = 1; i <= result.data.length; i++) {
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
@@ -1845,7 +1897,7 @@
trindex = result.data.length - 1;
$("#HEntryID").val() - 1
- }
+ }
}
})
}
@@ -2028,7 +2080,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -2062,7 +2116,7 @@
"HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
@@ -2384,6 +2438,7 @@
//鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
var nowindex = $(obj.tr).attr("data-index");
+ editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -2400,16 +2455,24 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
- set_SaveValue(dataindex + 1);
- if (isHavingCount == false) {
- //鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
- table.render(option_Value);
+ if (OperationType == 3) {
+ set_SaveValue(Number(nowindex) + Number(1));
+ } else {
+ set_SaveValue(dataindex + 1);
}
//璧嬪�间笌鍥炴樉
Assignment(nowindex, dataindex);
+ if (isHavingCount == false && OperationType != 3) {
+ var row_value = [];
+ for (let i = 0; i < SampleNum[nowindex]; i++) {
+ row_value.push({
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ });
+ }
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = row_value;
+ table.render(option_Value);
+ }
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
@@ -2420,19 +2483,7 @@
} else {
isFristClick = false;
}
- //console.log(maindata);
- //Array.some(item => {
- // console.log("==============item===============");
- // console.log(item);
- //})
- //for (let i = 0; i < table_value.length; i++) {
-
- //}
-
- ////console.log(arr_value_add);
- //console.log(Array);
- //console.log(table_value);
});
//#endregion
@@ -2442,6 +2493,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
$("#HInspectVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HInspectVal = $("#HInspectVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//瀹氶噺鍒嗘瀽
@@ -2457,6 +2511,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
$("#HTargetVal").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HTargetVal = $("#HTargetVal").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
//====================璧嬪��/浼犲��===========================
@@ -2477,6 +2534,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
$("#HUpLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpLimit = $("#HUpLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2494,6 +2554,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
$("#HDownLimit").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownLimit = $("#HDownLimit").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2511,6 +2574,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
$("#HUpOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HUpOffSet = $("#HUpOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2528,6 +2594,9 @@
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
$("#HDownOffSet").blur(function () {
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+
+ option.data[HEntryID].HDownOffSet = $("#HDownOffSet").val();
+
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
@@ -2806,7 +2875,7 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
- if (SummaryIndex.indexOf(nowindex) == -1) {
+ if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
HStatus: $("#HStatus").val(), //鐘舵��
@@ -2902,7 +2971,7 @@
$("#HSampleDamageQty").val("")
$("#HSampleQty").val("")
$("#HSampleQty2").val("")
- $("#HAcceptQty").val("")
+ $("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
$("#HRejectQty").val("")
$("#HStrictness").val("")
@@ -2973,83 +3042,125 @@
HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
};
} else {
+ //var dataobj = {
+ // HEntryID: $("#HEntryID").val(), //琛屽彿
+ // HStatus: $("#HStatus").val(), //鐘舵��
+ // HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ // HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ // //xxx: $("#xxx").val(),
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnit: $("#HUnit").val(), //鍗曚綅
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ // HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ // HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ // HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ // HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HAQL: $("#HAQL").val(), //AQL
+ // HSamplingType: $("#HSamplingType").val(),
+
+ // HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ // HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ // HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ // HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ // HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ // HUnitName: $("#HUnitName").val(), //鍗曚綅
+ // HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ // HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ // HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ // HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ // HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ // HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ // HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ // HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ //};
+
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
HStatus: $("#HStatus").val(), //鐘舵��
- HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
- HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
//xxx: $("#xxx").val(),
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnit: $("#HUnit").val(), //鍗曚綅
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
- HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
- HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
- HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HAQL: $("#HAQL").val(), //AQL
- HSamplingType: $("#HSamplingType").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ 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, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
- HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnitName: $("#HUnitName").val(), //鍗曚綅
- HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ 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, //妫�楠屽��
+ 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, //涓嬪亸宸�
};
}
-
+ //if (option.data[0].HSampleSchemeID == 0) {
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
- maindata[dataindex].HStatus = dataobj.HStatus;
- maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
- maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
- maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
- maindata[dataindex].HUnit = dataobj.HUnit;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
- maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
- maindata[dataindex].HRejectQty = dataobj.HRejectQty;
- maindata[dataindex].HStrictness = dataobj.HStrictness;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HAQL = dataobj.HAQL;
- maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+ maindata[nowindex].HStatus = dataobj.HStatus;
+ maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[nowindex].HUnit = dataobj.HUnit;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[nowindex].HRejectQty = dataobj.HRejectQty;
+ maindata[nowindex].HStrictness = dataobj.HStrictness;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HAQL = dataobj.HAQL;
+ maindata[nowindex].HSamplingType = dataobj.HSamplingType;
- maindata[dataindex].HSampleQty = dataobj.HSampleQty;
- maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
- maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
- maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
- maindata[dataindex].HUnitID = dataobj.HUnitID;
- maindata[dataindex].HUnitName = dataobj.HUnitName;
- maindata[dataindex].HInspectValB = dataobj.HInspectValB;
- maindata[dataindex].HInspectVal = dataobj.HInspectVal;
- maindata[dataindex].HTargetValB = dataobj.HTargetValB;
- maindata[dataindex].HTargetVal = dataobj.HTargetVal;
- maindata[dataindex].HUpLimit = dataobj.HUpLimit;
- maindata[dataindex].HDownLimit = dataobj.HDownLimit;
- maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
- maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[nowindex].HSampleQty = dataobj.HSampleQty;
+ maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[nowindex].HUnitID = dataobj.HUnitID;
+ maindata[nowindex].HUnitName = dataobj.HUnitName;
+ maindata[nowindex].HInspectValB = dataobj.HInspectValB;
+ maindata[nowindex].HInspectVal = dataobj.HInspectVal;
+ maindata[nowindex].HTargetValB = dataobj.HTargetValB;
+ maindata[nowindex].HTargetVal = dataobj.HTargetVal;
+ maindata[nowindex].HUpLimit = dataobj.HUpLimit;
+ maindata[nowindex].HDownLimit = dataobj.HDownLimit;
+ maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
+ //}
+
//鍥炴樉
$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
@@ -3097,45 +3208,55 @@
$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
- var HInterID = $("#HInterID").val();
- var HEntryID = $("#HEntryID").val();
- isHavingCount = false;
//鍥炴樉妫�楠屽��
- $.ajax({
- url: GetWEBURL() + "/QC_ValueTable/getValueList",
- type: "GET",
- async: false,
- data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- isHavingCount = true
-
- var data = result.data;
-
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- //瀛欒〃 璧嬪��
- rowdata.push({
- "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
- });
- }
-
- option_Value.data = rowdata;
- table.render(option_Value);
- for (var i = 0; i < result.data.length; i++) {
- $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
- }
-
- IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
- form.render('select');
- } else {
- //layer.msg(result.code + result.Message, { icon: 5 });
- }
- }
- })
+ EchoValue();
}
}
//#endregion
+
+ //鍥炴樉妫�楠屽��
+ function EchoValue() {
+ var HInterID = $("#HInterID").val();
+ var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val();
+ isHavingCount = false;
+ //鍥炴樉妫�楠屽��
+ $.ajax({
+ url: GetWEBURL() + "/QC_ValueTable/getValueList",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ isHavingCount = true
+
+ var data = result.data;
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛欒〃 璧嬪��
+ rowdata.push({
+ "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"] == '' ? 0 : data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"] == '' ? 0 : data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"] == '' ? 0 : data[i]["HInSpectValue"]
+ });
+ }
+
+ option_Value.data = rowdata;
+ table.render(option_Value);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
+ } else {
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ //layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
//鑾峰彇涓嶅悎鏍兼暟鎬绘暟
function addUnRightQty() {
@@ -3372,45 +3493,47 @@
//妫�楠屽�间繚瀛�
function set_SaveValue(dataindex) {
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "") {
- table.cache['ValueTable'][i].HInSpectValueB = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValueT == "") {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "") {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
- console.log(sValueTable);
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+ //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;
+ //var msg = sValueTable + ";" + HInterID + ";" + HEntryID
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/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_FirstPieceCheckBill/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銆愰殣钘忔娴嬪�煎瓧娈点��
@@ -3536,7 +3659,6 @@
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HEntryID = $("#HEntryID").val() - 1;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
- console.log(HAnalysisMethod);
switch (field) {
case "HInspectVal": //妫�楠屽��
value = isNaN(value) ? 0 : value;
--
Gitblit v1.9.1