From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 161 +++++++++++++++++++++++++++--------------------------
1 files changed, 81 insertions(+), 80 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 6729c89..02af6ba 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"
@@ -662,6 +662,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
+ debugger;
var rowdata = [];
var option = [];
@@ -726,6 +727,9 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -741,6 +745,9 @@
});
}
else if (OperationType == 2) {
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
+
if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
@@ -796,25 +803,32 @@
type: "GET",
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
- var data = result.data[0];
- if (result.count == 1) {
- $("#HProcExchBillNo").val(data.HProcExchBillNo);
- $("#HProcExchInterID").val(data.HProcExchInterID);
- $("#HProcExchEntryID").val(data.HProcExchEntryID);
- $("#HProcExchQty").val(data.HProcExchQty);
- $("#HICMOBillNo").val(data.HICMOBillNo);
- $("#HICMOInterID").val(data.HICMOInterID);
- $("#HICMOQty").val(data.HICMOQty);
- $("#HSourceName").val(data.HSourceName);
- $("#HSourceID").val(data.HSourceID);
- $("#HMaterID").val(data.HMaterID);
- $("#HMainSourceBillNo").val("");
- $("#HMainSourceBillType").val(data.HBillType);
- $("#HMainSourceInterID").val(data.HInterID);
- $("#HICMOEntryID").val(HICMOEntryID);
- } else {
- layer.alert(result.Message, { icon: 5 });
- }
+ if (result.code == 1) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.HProcExchBillNo);
+ $("#HProcExchInterID").val(data.HProcExchInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID);
+ $("#HProcExchQty").val(data.HProcExchQty);
+ $("#HICMOBillNo").val(data.HICMOBillNo);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty);
+ $("#HSourceName").val(data.HSourceName);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMainSourceBillNo").val("");
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }
+
layer.close(wait);
}, error: function () {
layer.close(wait);
@@ -1214,7 +1228,7 @@
return;
}
- if (sSubTable[i].HSampleSchemeID == '') {
+ if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
sSubTable[i].HSampleSchemeID = 0
}
if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
@@ -1365,7 +1379,7 @@
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].缁撹,
+ "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,
@@ -1375,14 +1389,13 @@
}
)
- console.log(data[i].鐩爣鍊�);
SummaryIndex.push(i.toString());
}
option.data = 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))
@@ -1668,7 +1681,6 @@
$("#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].鎶芥牱绫诲瀷;
@@ -1750,7 +1762,7 @@
table.render(option);
//妫�楠屽��
option_Value.data = rowdata_Value;
- console.log(JSON.stringify(option_Value.data));
+ //console.log(JSON.stringify(option_Value.data));
table.render(option_Value);
//================================================
for (var i = 1; i <= result.data.length; i++) {
@@ -2310,21 +2322,15 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
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++) {
@@ -2335,11 +2341,7 @@
//鍒锋柊妫�楠屽�艰〃鏍�
option_Value.data = row_value;
table.render(option_Value);
- console.log(option_Value.data);
}
-
- //璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
if (isFristClick != true) {
//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
//console.log('aaa');
@@ -2741,7 +2743,6 @@
//#region銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
- console.log(JSON.stringify(option.data));
if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
HEntryID: $("#HEntryID").val(), //琛屽彿
@@ -3360,49 +3361,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銆愰殣钘忔娴嬪�煎瓧娈点��
--
Gitblit v1.9.1