From be7d738131c8cf9c8e00c6abfde469f2d82cbfb0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 15 三月 2024 16:48:45 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 186 +++++++++++++++++++++++++---------------------
1 files changed, 102 insertions(+), 84 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..f7120d2 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"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -53,6 +54,7 @@
<button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸ュ簭妫�楠屽崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -662,6 +664,7 @@
, laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
+ debugger;
var rowdata = [];
var option = [];
@@ -685,6 +688,14 @@
// icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
// }, function () { window.location.href = "../../user/login.html"; });
//}
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7507";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
@@ -726,6 +737,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 +755,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 +813,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);
@@ -996,6 +1020,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') //妯″叿淇℃伅
{
@@ -1018,12 +1043,16 @@
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) {
@@ -1214,7 +1243,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 +1394,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 +1404,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 +1696,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].鎶芥牱绫诲瀷;
@@ -1729,7 +1756,7 @@
//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
//}
{
- "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]["HResult"],
+ "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].鎷掔粷鏁�,
@@ -1750,7 +1777,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++) {
@@ -1991,6 +2018,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
@@ -2008,8 +2036,8 @@
//, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
- , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true}
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
//, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
@@ -2069,6 +2097,7 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
@@ -2310,21 +2339,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 +2358,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 +2760,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 +3378,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