From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表：layui中开发 查看包装明细
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 484 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 391 insertions(+), 93 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 1cabd2a..b4ff437 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"
@@ -121,6 +121,22 @@
<input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly value="0">
</div>
</div>
+ <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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" 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>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
<div class="layui-inline" id="hidediv2">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -139,23 +155,22 @@
</div>
</div>
</div>
-
-
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" 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;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" 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">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -194,21 +209,10 @@
<input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
- <div class="layui-inline" id="hidediv1" 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>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" 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">
- <label class="layui-form-label" style="width: 85px;">鍙栨牱鍗�</label>
+ <div class="layui-inline" style="width: 45%;">
+ <label class="layui-form-label" style="width: 85px;">SN鐮佽褰�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ <input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -304,11 +308,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -808,36 +812,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 +979,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 +996,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 });
}
@@ -1074,7 +1106,8 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "",
+ "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
};
switch (obj.event) {
@@ -1413,6 +1446,147 @@
}
});
}
+ if (obj.event === 'HQualityStdName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HQualityStdID": OptionData[0].HItemID
+ , "HQualityStdName": OptionData[0].璐ㄩ噺鏍囧噯鍚嶇О
+ })
+ } else {
+ layer.msg("璇ヨ川閲忔爣鍑嗗凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectMethodName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectMethodID": OptionData[0].HItemID
+ , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectBasisID": OptionData[0].HItemID
+ , "HInspectBasisName": OptionData[0].妫�楠屼緷鎹悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屼华鍣ㄥ凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
obj.event = "";
@@ -1449,7 +1623,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 +1720,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;
@@ -1727,6 +1905,7 @@
, "HLastResult": data.鍒ゅ畾缁撹 == "鍚堟牸" ? "true" : "false"
, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HRemarkSN": data.HRemarkSN
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1741,8 +1920,8 @@
"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, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": 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": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�, "HCompareSymbol": data[i].姣旇緝绗�, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].妫�楠屼緷鎹�,"HCompareSymbol":data[i].姣旇緝绗�
}
)
@@ -2087,7 +2266,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 +2291,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",
@@ -2129,18 +2308,19 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": 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": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HCompareSymbol": 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].鎶芥牱绫诲瀷
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": 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 +2348,62 @@
$("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].涓嬮檺鍊�);
+ //姣旇緝绗�
+ $("#HComparator").val(data[data.length - 1].姣旇緝绗�);
+
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
+ 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].涓嬮檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HCompareSymbol = 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 +2430,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()
});
}
//妫�楠岄」鐩�
@@ -2307,7 +2540,7 @@
$("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HMaterID);
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -2541,7 +2774,7 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
}];
option = {
elem: '#mainTable'
@@ -2565,13 +2798,21 @@
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { 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: 'HCompareSymbol', title: '姣旇緝绗�'}
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
@@ -2587,7 +2828,6 @@
, { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
, { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
, { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
- , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
, { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
@@ -2621,20 +2861,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' }
@@ -2820,6 +3061,7 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ option.data[HEntryID].HCompareSymbol = selectValue;
//鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
if (HAnalysisMethod == 2) {
if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
@@ -2876,9 +3118,17 @@
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].涓嬮檺鍊�);
+ $("#HComparator").val(option_Check[nowindex].姣旇緝绗�)
+ }
+
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2903,7 +3153,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": ""
});
}
//鍒锋柊妫�楠屽�艰〃鏍�
@@ -2921,6 +3171,8 @@
isFristClick = false;
}
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
});
//#endregion
@@ -3319,7 +3571,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: $("#HUnitID").val(), //鍗曚綅ID
HUnit: $("#HUnit").val(), //鍗曚綅
HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3397,7 +3649,7 @@
$("#HSampleSchemeID").val(0);
$("#HSampleSchemeName").val("");
- //xxx: $("#xxx").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#HUnitID").val(0);
$("#HUnit").val("");
$("#HInspectVal").val("");
@@ -3445,7 +3697,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3485,7 +3737,7 @@
// HStatus: $("#HStatus").val(), //鐘舵��
// HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
// HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- // //xxx: $("#xxx").val(),
+ // //HCompareSymbol: $("#HCompareSymbol").val(),
// HUnitID: $("#HUnitID").val(), //鍗曚綅ID
// HUnit: $("#HUnit").val(), //鍗曚綅
// HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3525,7 +3777,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3547,17 +3799,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) {
@@ -3603,13 +3855,14 @@
//鍥炴樉
$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
$("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
- //xxx: $("#xxx").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#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);
+ $("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].姣旇緝绗� : "=") : maindata[nowindex].HCompareSymbol);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3632,7 +3885,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);
@@ -3684,13 +3937,41 @@
}
IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
- form.render('select');
+
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ //var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) )).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) )).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+
+ 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 });
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
}
}
})
@@ -4045,9 +4326,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);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -4059,9 +4340,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", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -4075,9 +4356,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);//鐩爣鍊兼寜閽�
@@ -4242,6 +4523,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 });
@@ -4459,7 +4741,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) { //娴佽浆鍗�
@@ -4520,6 +4805,19 @@
function GetInspectInstruMentValue(obj) {
OptionData = obj;
}
+ //璐ㄩ噺鏍囧噯
+ function GetQualityStdValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屾柟娉�
+ function GetInspectMethodValue(obj) {
+ OptionData = obj;
+ }
+
+ //妫�楠屼緷鎹�
+ function GetInspectBasisValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1