From d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 17:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 1555 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 1,257 insertions(+), 298 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 02af6ba..80c4676 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; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -41,16 +42,17 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
- </button>-->
- <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
- </button>-->
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <div style="position: relative; display: flex; align-items: center; padding: 10px;">
+ <!-- 鎸夐挳缁� -->
+ <div style="z-index: 1;">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
+ </div>
+ <!-- 鏍囬锛屼娇鐢ㄧ粷瀵瑰畾浣嶄娇鍏跺湪鐖跺鍣ㄥ唴灞呬腑 -->
+ <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>宸ュ簭妫�楠屽崟</b></h1>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -72,17 +74,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 68px;">
</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="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" name="HSourceID" id="HSourceID" 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="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HShiftsID" id="HShiftsID" value="0">
</div>
</div>
</div>
@@ -91,6 +103,8 @@
<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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -102,65 +116,52 @@
<input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞唴鐮�</label>
+ <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;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ <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="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" value="0" style="background-color:#efefef4d;" readonly>
</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="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <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>
+ <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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly>
- </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="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <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>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
</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="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
+
</div>
</div>
- </div>
- <div class="layui-row">
<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;">
@@ -170,25 +171,55 @@
</button>
<input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
</div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HBatchNo" id="HBatchNo" style="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒ゆ柇缁撹</label>
+ <div class="layui-input-block">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <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-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">
+ </div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 50%;">
+ <div class="layui-inline" style="width: 45%;">
<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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゆ柇缁撹</label>
- <div class="layui-input-block">
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
</div>
</div>
</div>
+
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -281,11 +312,11 @@
<div class="layui-tab-item">
<!--鎶芥牱妫�楠�-->
<!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
- </div>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">椤圭洰搴忓彿</label>
@@ -330,13 +361,13 @@
<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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
</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="HSampleDamageQty" id="HSampleDamageQty" style="">
+ <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
</div>
</div>
</div>
@@ -360,14 +391,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">妫�楠岀粨鏋�</label>
- <div class="layui-input-block">
- <select name="HResult" lay-filter="HResult" style="width:190px;">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -383,11 +414,11 @@
</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="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -416,11 +447,11 @@
<div class="layui-tab-item" style="height:590px">
<!--妫�娴嬪��-->
<!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
- <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
- </div>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
<div class="left" style="width:50%;height:450px;float:left;">
<div class="layui-row">
<div class="layui-inline">
@@ -454,14 +485,14 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HInspectResult" lay-filter="HInspectResult">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HInspectResult" lay-filter="HInspectResult">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
@@ -477,11 +508,11 @@
</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="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
@@ -492,14 +523,14 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
- <div class="layui-input-block" style="margin-left: 100px; width: 182px">
- <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
- <option value="鍚堟牸" selected="selected">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
<div class="layui-input-block" style="margin-left: 100px; width: 182px">
@@ -597,6 +628,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<!--闅愯棌瀛楁-->
@@ -604,7 +636,6 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
- <input type="hidden" name="HProcID" id="HProcID" value="1">
</form>
</div>
</div>
@@ -648,6 +679,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -661,10 +693,11 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
- //鍏敤鍙橀噺
- debugger;
+ //鍏敤鍙橀噺
var rowdata = [];
var option = [];
+ var HDeptID = "";//閮ㄩ棬id 鑾峰彇鐝
+ var HCenterID = "";//宸ヤ綔涓績id 鑾峰彇鐝
var rowdata_Value = [];
var option_Value = [];
@@ -679,6 +712,8 @@
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
var editIndex = 0;//缂栬緫涓嬫爣
var SampleNum = [];//鏍锋湰鏁伴噺
+ var HModName = "QC_ProcessCheckBill";
+ var isOpenBox = "0";//鏄惁鎵撳紑寮规鍒板畨鐏〉闈�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -686,6 +721,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.鏃犳簮鍗曟柊澧�
@@ -713,6 +756,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -722,14 +766,21 @@
//var HSouceBillType = 3722;
////var HICMOEntryID = 100027;
//var HICMOEntryID = "";
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
+ HDeptID = sessionStorage["HDeptID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -743,15 +794,19 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ //鑾峰彇鐝
+ get_HWorkShift();
}
else if (OperationType == 2) {
- $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
- $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ HDeptID = sessionStorage["HDeptID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
}
else {
$("#HInterID").val("");
@@ -774,15 +829,54 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ //鎶ュ伐骞冲彴鏈欢
if (HSouceBillType == 3722 || HSouceBillType == 4610) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation2();
- } else if (HSouceBillType == 3791) {
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+ (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
+ }
+ }
+ //宸ュ簭鍑虹珯鍗曞垪琛� 鏈欢
+ else if (HSouceBillType == 3791) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationOutBill();
- } else {
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ 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();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ 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();
+ //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ 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 });
}
+ //鑾峰彇鐝
+ get_HWorkShift();
}
}
else if (OperationType == 3) {
@@ -792,8 +886,6 @@
$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
function LoadingInformation2() {
@@ -801,6 +893,7 @@
$.ajax({
url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
type: "GET",
+ async: false,
data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
success: function (result) {
if (result.code == 1) {
@@ -816,19 +909,23 @@
$("#HSourceName").val(data.HSourceName);
$("#HSourceID").val(data.HSourceID);
$("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.HMaterName);
$("#HMainSourceBillNo").val("");
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
+
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
- }
-
+ }
+
layer.close(wait);
}, error: function () {
layer.close(wait);
@@ -843,6 +940,7 @@
$.ajax({
url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
type: "GET",
+ async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
@@ -876,16 +974,107 @@
}
});
}
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+ function LoadingInformation_ICMO() {
+ $("#hidediv1").attr({ "style": "display:none" });
+ $("#hidediv2").attr({ "style": "display:none" });
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_ICMOBill',
+ type: "GET",
+ async: false,
+ data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+ $("#HICMOInterID").val(data.hmainid);
+ $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#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 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(宸ュ簭娴佽浆鍗�)
+ function LoadingInformation_ProcExchange() {
+ $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熶骇璧勬簮鎸夐挳鍚敤
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.鍗曟嵁鍙�);
+ $("#HProcExchInterID").val(data.HInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID == null ? 0 : data.HProcExchEntryID);//
+ $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HICMOBillNo").val(data.浠诲姟鍗�);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty == null ? 0 : data.HICMOQty);//
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);//
+ $("#HSourceID").val(data.HSourceID == null ? 0 : data.HSourceID);//
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.浜у搧鍚嶇О);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ $("#HICMOEntryID").val(data.HICMOEntryID == null ? 0 : data.HICMOEntryID);//
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HProcID").val(data.HProcID);//
+ $("#HProcName").val(data.褰撳墠宸ュ簭);//
+ $("#HBatchNo").val(data.鎵瑰彿);
+ $("#HTakeSampleCheckBillNo").val(data.鍗曟嵁鍙�);
+ $("#HTakeSampleCheckBillID").val(data.HInterID);
+ HDeptID = data.HWorkShopID == null ? sessionStorage["HDeptID"] : data.HWorkShopID;//宸ヤ綔涓績id
+ HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//宸ヤ綔涓績id
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "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": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
switch (obj.event) {
@@ -920,13 +1109,44 @@
form.render('select');
}
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
- //閫�鍑烘寜閽�
- form.on('submit(btn-Exit)', function (data) {
- get_Exit();
+ //SIP鏌ョ湅鎸夐挳
+ form.on('submit(btn-SIP)', function () {
+ var HProcID = $("#HProcID").val();
+ var HMaterID = $("#HMaterID").val();
+ if (HProcID == 0 && HMaterID == 0) {
+ layer.alert("鐗╂枡鍚嶇О涓庡伐搴忎笉鑳戒负绌�", { icon: 5 });
+ }
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
+
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btn-Exit)', function (data) {
sWhere = " and hmainid = " + $("#HInterID").val();
$.ajax({
url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
@@ -951,6 +1171,7 @@
}
}
})
+ get_Exit();
});
//鏂板鎸夐挳
@@ -958,6 +1179,11 @@
window.location.reload();
});
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(0);
+ });
+ //#endregion
//閫�鍑�
function get_Exit() {
@@ -1010,6 +1236,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') //妯″叿淇℃伅
{
@@ -1022,7 +1249,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1032,20 +1259,74 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ if (checkStatus.data.length === 1) {
+ var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+ , 妫�楠岄」鐩唬鐮�: 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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ } else {
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HQCCheckItemID"] != 0 && tableBak[i]["妫�楠岄」鐩�"] != "" && tableBak[i]["HResult"] != undefined && tableBak[i]["HResult"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "妫�楠岄」鐩�": checkStatus.data[i].鍚嶇О, "妫�楠岄」鐩唬鐮�": checkStatus.data[i].浠ｇ爜, "HQCCheckItemID": checkStatus.data[i].HItemID,
+ "HResult": 1, "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
+ "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": "0",
+ "HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
+ });
+ }
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
- , HQCCheckItemID: checkStatus.data[0].HItemID
- });
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ 妫�楠岄」鐩�: OptionData[0].鍚嶇О,
+ 妫�楠岄」鐩唬鐮�: OptionData[0].浠ｇ爜,
+ HQCCheckItemID: OptionData[0].HItemID,
+ HResult: 1
+ });
+ $('#HResult' + rowIndex + '').find("option[value='" + 1 + "']").attr("selected", true);
+ form.render('select');
+ OptionData = [];
+ }
}
});
}
@@ -1060,7 +1341,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1073,6 +1354,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�,
妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
@@ -1083,7 +1365,15 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ 妫�楠屼华鍣ㄤ唬鐮�: OptionData[0].妫�楠屼华鍣ㄤ唬鐮�,
+ 妫�楠屼华鍣�: OptionData[0].妫�楠屼华鍣ㄥ悕绉�,
+ HInspectInstruMentID: OptionData[0].HItemID
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1109,7 +1399,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1122,10 +1412,11 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
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].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+ var DXValue = checkStatus.data[0].妫�娴嬪�煎悕绉�; //瀹氭�ф娴嬪��
var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
@@ -1196,6 +1487,49 @@
}
});
+
+ table.on('edit(mainTable)', function (obj) {
+ var cell = $(this);
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ //var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ //var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = rowIndex;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : parseFloat(value);
+
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ LastResult();
+ }
+ break;
+ }
+ });
+
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
@@ -1204,7 +1538,7 @@
//淇濆瓨
function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
- Assignment(LastIndex, LastIndex);
+ //Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
set_SaveValue($("#HEntryID").val());
@@ -1212,13 +1546,16 @@
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 ($("#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;
+ }
+ if (data.field.HCheckerResult == "false") {
+ isOpenBox = "1";
}
var sSubTable = table.cache['mainTable'];
for (var i = 0; i < sSubTable.length; i++) {
@@ -1254,6 +1591,7 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubValue = JSON.stringify(table.cache['ValueTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+
var index = layer.load();
$.ajax({
type: "POST",
@@ -1262,18 +1600,40 @@
data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
+ if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ $('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
+ if (isOpenBox == "1") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '寮傚父鍙嶉鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HICMOBillNo": $("#HICMOBillNo").val(),//宸ュ崟鍙�
+ "HSourceName": $("#HSourceName").val(), //璁惧
+ "HType": "娴嬮噺鍘熷洜", //寮傚父绫诲瀷
+ "HSourceBillNo": $("#HMainSourceBillNo").val() //娴佽浆鍗″彿
+ });
+
+ // 閫氳繃绱㈠紩鑾峰彇鍒板綋鍓� iframe 寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ // 璋冪敤 iframe 寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
}
else {
layer.close(index);
@@ -1288,22 +1648,12 @@
}
//缂栬緫鏃跺姞杞借〃澶�
- function RoadBillMain(linterid) {
- //$.ajax({
- // url: GetWEBURL() + "/Web/GetPonderationBill",
- // type: "GET",
- // data: { "HInterID": linterid },
- // success: function (d) {
- // // console.log(d.data);
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // }
- //})
+ function RoadBillMain(linterid) {
var ajaxLoad = layer.load();
var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
+ url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -1323,6 +1673,7 @@
, "HICMOEntryID": data.HICMOEntryID
, "HMaterID": data.HMaterID
, "HMaterName": data.鐗╂枡鍚嶇О
+ , "HMaterNumber": data.鐗╂枡浠ｇ爜
, "HProcExchQty": data.HProcExchQty
, "HProcExchBillNo": data.HProcExchBillNo
, "HProcExchInterID": data.HProcExchInterID
@@ -1370,15 +1721,26 @@
, "HEntryID": data.hsubid
, "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
, "HQCCheckItemID": data.HQCCheckItemID
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HBatchNo": data.鎵瑰彿
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HProcID": data.HProcID
+ , "HProcName": data.HProcName
});
+
+ $("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
+ $("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
+ form.render("radio");
data = result.data;
- //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
//瀛愯〃 璧嬪��
var rowdata = [];
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].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�, "妫�楠屼华鍣�": 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,
@@ -1438,6 +1800,8 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
+ var HProcName = $("#HProcName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1447,7 +1811,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '&HProcName=' + HProcName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1457,9 +1821,47 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
- $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID").val(checkStatus.data[0].hmainid);
+ $("#HQCSchemeName").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
get_CheckItem();
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HInterID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1486,7 +1888,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1524,7 +1926,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=HUnitList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1535,7 +1937,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HUnitID").val(checkStatus.data[0].HItemID);
- $("#HUnit").val(checkStatus.data[0].HName);
+ $("#HUnit").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1562,7 +1964,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html?type=HInspect1', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1572,8 +1974,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HInspectValB").val(checkStatus.data[0].hmainid);
- $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HInspectValB").val(checkStatus.data[0].HItemID);
+ $("#HInspectVal").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
//==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
var HComparator = $("#HComparator").val(); //姣旇緝绗�
@@ -1609,7 +2011,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html?type=HInspect', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1619,10 +2021,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HTargetValB").val(checkStatus.data[0].hmainid);
- $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
- $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
- $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HTargetValB").val(checkStatus.data[0].HItemID);
+ $("#HTargetVal").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
+ $("#HUpLimit").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
+ $("#HDownLimit").val(checkStatus.data[0].妫�娴嬪�煎悕绉�);
//==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
var HComparator = $("#HComparator").val(); //姣旇緝绗�
@@ -1681,23 +2083,26 @@
$("#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].鎶芥牱绫诲瀷;
- 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].涓嬮檺鍊�;
+
+ if ($("#HEntryID").val() - 1 >= 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({
- "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;
@@ -1719,12 +2124,14 @@
});
//#endregion
+ //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
+
function get_CheckItem() {
- var HBatchQty = $("#HProcExchQty").val();
+ var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
success: function (result) {
if (result.code == 1) {
var rowdata = [];
@@ -1741,14 +2148,15 @@
//"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].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": 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": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + 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].鎶芥牱绫诲瀷
}
);
- SampleNum.push(data[i].鏍锋湰閲�);
+ //SampleNum.push(5);
+ SampleNum.push(data[0].鏍锋湰閲�);
}
//妫�楠岄」鐩�
@@ -1782,11 +2190,131 @@
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
- }
+ $("#HEntryID").val() - 1
+
+ //鎼哄甫鍑烘娊鏍锋柟妗�
+ ReturnSampleScheme(data);
+ }
}
})
}
+
+ //鏍规嵁璐ㄦ鏂规鑷姩甯﹀嚭鎶芥牱鏂规淇℃伅
+ function ReturnSampleScheme(data) {
+ $("#HSampleSchemeID").val(data[data.length - 1].hmainid);
+ $("#HSampleSchemeName").val(data[data.length - 1].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(data[data.length - 1].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(data[data.length - 1].妫�楠屾按骞�);
+ $("#HStrictness").val(data[data.length - 1].涓ユ牸搴�);
+ $("#HAQL").val(data[data.length - 1].AQL);
+ $("#HSampleQty").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HSampleQty2").val(data[data.length - 1].鏍锋湰閲�);
+ $("#HAcceptQty").val(data[data.length - 1].鍏佽鏁�);
+
+ $("#HRejectQty").val(data[data.length - 1].鎷掔粷鏁�);
+ //鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
+ $("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
+ $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = data[data.length - 1].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = data[data.length - 1].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = data[data.length - 1].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = data[data.length - 1].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+ }
+
+ rowdata_Value = [];
+ for (let i = 1; i <= data[data.length - 1].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+
+ IsHide(table.cache["mainTable"][$("#HEntryID").val() - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ }
+
+ window.get_CheckItem1 = function () {
+ var HBatchQty = $("#HProcExchQty").val();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ rowdata_Value = [];
+ var data = result.data;
+ 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": ""
+ //}
+ {
+ "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",
+ "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(data[i].鏍锋湰閲�);
+ }
+
+ //妫�楠岄」鐩�
+ for (let j = 1; j <= data[data.length - 1].鏍锋湰閲�; j++) {
+ rowdata_Value.push({
+ "HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "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);
+ }
+ form.render('select');
+
+ option_Check = result.data;
+
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ trindex = result.data.length - 1;
+ $("#HEntryID").val() - 1
+ }
+ }
+ })
+ }
+
+ //#endregion
//琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
form.on('submit(btnSearchProcExch)', function () {
@@ -1799,7 +2327,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes'],
+ content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1838,7 +2366,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html', 'yes'],
+ content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1849,9 +2377,12 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HICMOInterID").val(checkStatus.data[0].hmainid);
- $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+ $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
$("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(checkStatus.data[0].HMaterID)
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1878,7 +2409,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1888,7 +2419,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+ $("#HFirstCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1916,7 +2447,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1926,9 +2457,53 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_ICMOBillStatusList();
+ get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_ICMOBillStatusList();
+ get_QC_TakeSampleCheckBillList();
+ GetCheckItemID();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1954,7 +2529,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1964,8 +2539,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ GetCheckItemID();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1990,19 +2566,21 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//鍒濆鍖栫鐢ㄥ鏍告寜閽�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "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": "",
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
+ , totalRow: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
@@ -2010,8 +2588,14 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , {
+ field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
+ }, style: 'cursor: pointer;'
+ }
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
@@ -2020,8 +2604,12 @@
//, { 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: 'HTargetVal', title: '鐩爣鍊�' }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�' }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
+ , { 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' }
@@ -2040,13 +2628,10 @@
, { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
, { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
- , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
, { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
- , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
- , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
, { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
, { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
]]
, done: function (res, curr, count) {
option.data = res.data;
@@ -2073,7 +2658,7 @@
//鍒濆琛ㄦ牸鏁版嵁
rowdata_Value = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
}];
option_Value = {
elem: '#ValueTable'
@@ -2081,11 +2666,13 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, 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' }
, { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -2112,6 +2699,9 @@
//鍔犺浇绌鸿〃鏍�
option_Value.data = rowdata_Value;
table.render(option_Value);
+
+ //琛ㄤ綋鍒楄缃煡璇�
+ DisPlay_HideColumn();
}
//琛岄�夋嫨澶勭悊锛堢粨璁猴級
@@ -2156,11 +2746,11 @@
}
}
if (HQty > 0) {
- document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
@@ -2309,9 +2899,15 @@
editIndex = Number(nowindex) + Number(1);
LastIndex = nowindex;
- $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //鏄剧ず褰撳墠鍙屽嚮琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
+ $("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
+ $("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
+ $("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ }
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2322,7 +2918,7 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
-
+
if (OperationType == 3) {
set_SaveValue(Number(nowindex) + Number(1));
} else {
@@ -2330,12 +2926,14 @@
}
//璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
+ if ($("#HSampleSchemeID").val() != "0") {
+ 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": ""
+ "HSEQ": (i + 1), "HInSpectResult": "", "HInSpectValueB": "0", "HInSpectValueB_Text": "", "HInSpectValueT": "", "HInSpectValue": ""
});
}
//鍒锋柊妫�楠屽�艰〃鏍�
@@ -2356,7 +2954,7 @@
//#endregion
- //#region銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
+ //#region 銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
//[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
$("#HInspectVal").blur(function () {
@@ -2481,7 +3079,7 @@
//#endregion
- //#region銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
+ //#region 銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
function Qualified(HComparator, HEntryID, HAnalysisMethod) {
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
@@ -2492,7 +3090,7 @@
var HStatus = $("#HStatus").val() //鐘舵��
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
- //#region銆愬畾鎬у垎鏋愭柟娉曘��
+ //#region 銆愬畾鎬у垎鏋愭柟娉曘��
if (HAnalysisMethod == 1) {
//鐘舵�佷负鍚堟牸
if (HStatus == 1) {
@@ -2527,7 +3125,7 @@
}
}
//#endregion
- //#region銆愬畾閲忓垎鏋愭柟娉曘��
+ //#region 銆愬畾閲忓垎鏋愭柟娉曘��
else if (HAnalysisMethod == 2) {
//鐘舵�佷负鍚堟牸
if (HStatus == 1) {
@@ -2686,7 +3284,7 @@
}
}
//#endregion
- //#region銆愬叾浠栧垎鏋愭柟娉曘��
+ //#region 銆愬叾浠栧垎鏋愭柟娉曘��
else if (HAnalysisMethod == 3) {
//鐘舵�佷负鍚堟牸
if (HStatus == 1) {
@@ -2741,7 +3339,7 @@
};
//#endregion
- //#region銆愯祴鍊间笌鍥炴樉銆�
+ //#region 銆愯祴鍊间笌鍥炴樉銆�
function Assignment(nowindex, dataindex) {
if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
var dataobj = {
@@ -2771,17 +3369,17 @@
HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ //HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ //HUnitID: $("#HUnitID").val(), //鍗曚綅ID
HUnitName: $("#HUnitName").val(), //鍗曚綅
HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ //HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ //HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ //HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ //HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ //HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ //HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
};
//鑾峰彇鏂囨湰妗嗗��
@@ -2836,8 +3434,8 @@
$("#HDownLimit").val(0);
$("#HUpOffSet").val(0);
$("#HDownOffSet").val(0);
- $("#HSampleDamageQty").val("")
- $("#HSampleQty").val("")
+ $("#HSampleDamageQty").val("0")
+ $("#HSampleQty").val("0")
$("#HSampleQty2").val("")
$("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
@@ -2847,7 +3445,7 @@
$("#HSampleUnRightQty2").val("")
$("#HAQL").val("")
$("#HSamplingType").val("")
- $("#HSampleQty").val("")
+ $("#HSampleQty").val("0")
$("#HInspectResultToSee").val("")
$("#HInspectResultToSee2").val("")
$("#HSampleUnRightQty").val("")
@@ -3037,9 +3635,9 @@
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
- $("#HTargetVal").val(maindata[nowindex].HTargetVal);
- $("#HUpLimit").val(maindata[nowindex].HUpLimit);
- $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal);
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit);
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3062,7 +3660,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);
@@ -3121,7 +3719,75 @@
}];
table.render(option_Value);
//layer.msg(result.code + result.Message, { icon: 5 });
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
}
+ }
+ })
+ }
+
+ //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
+ function get_ICMOBillStatusList() {
+ var sWhere = "";
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID
+ }
+
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+ $.ajax({
+ url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HProcID").val(result.data[0]["HProcID"]);
+ $("#HProcName").val(result.data[0]["宸ュ簭"]);
+ $("#HSourceID").val(result.data[0]["HSourceID"]);
+ $("#HSourceName").val(result.data[0]["鐢熶骇璧勬簮"]);
+
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+ //鍙栨牱鍗曟煡璇�
+ function get_QC_TakeSampleCheckBillList() {
+ var HProcID = $("#HProcID").val();
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var sWhere = "";
+
+ if (HProcID == "0" || HProcID == "") {
+ return layer.msg("璇烽�夋嫨宸ュ簭!");
+ }
+ sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+ $.ajax({
+ url: GetWEBURL() + "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.data.length > 0) {
+ $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
+ $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
})
}
@@ -3361,57 +4027,57 @@
//妫�楠屽�间繚瀛�
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銆愰殣钘忔娴嬪�煎瓧娈点��
+ //#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);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
@@ -3423,9 +4089,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", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
@@ -3439,9 +4105,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);//鐩爣鍊兼寜閽�
@@ -3466,7 +4132,7 @@
}
//#endregion
- //#region銆愭敼鍙橀�変腑琛岄鑹层��
+ //#region 銆愭敼鍙橀�変腑琛岄鑹层��
function check_row(obj) {
if (trindex != "") {
$("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
@@ -3513,6 +4179,228 @@
}
//#endregion
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ function GetCheckItemID() {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
+ success: function (result) {
+ 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 });
+ }
+ }
+ })
+ }
+ }
+
+ window.GetCheckItemID = function () {
+ var HName = $("#HMaterName").val();
+ var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemID",
+ type: "GET",
+ async: false,
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
+ success: function (result) {
+ 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 });
+ }
+ }
+ })
+ }
+ }
+
+ //鑾峰彇鐝
+ function get_HWorkShift() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HDeptID": HDeptID,
+ "HCenterID": HCenterID
+ },
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data;
+ $("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
+ $("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
+ }
+ //else {
+ // layer.alert(data.Message, { icon: 5 });
+ //}
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //#region 瀹℃牳鏁版嵁
+ function set_CheckBill() {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillMainValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] += "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -3524,8 +4412,79 @@
HReasonName, ReasonID, EmpName,
ZRProcName, QRName;
+ function GetGySource(obj) { //鐢熶骇璧勬簮
+ $("#HSourceName").val(obj.鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj.HItemID);
+ }
+ function GetICMOBillValue(obj) { //鐢熶骇璁㈠崟
+ $("#HICMOInterID").val(obj[0].hmainid);
+ $("#HICMOEntryID").val(obj[0].HEntryID);
+ $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(obj[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(obj[0].HMaterID);
+ }
+ function GetProcExValue(obj) { //娴佽浆鍗�
+ $("#HProcExchInterID").val(obj[0].hmainid);
+ $("#HProcExchEntryID").val(obj[0].hsubid);
+ $("#HProcExchBillNo").val(obj[0].鍗曟嵁鍙�);
+ }
+
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterID").val(obj.HItemID);
+ GetCheckItemID();
+ }
+
+ function GetHEmpValue(obj) { //璐ㄦ鍛�
+ $("#HFirstCheckEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HFirstCheckEmp").val(obj[0].HItemID);
+ }
+
+ function GetCheckProjectValue(obj) { //璐ㄦ鏂规
+ $("#HQCSchemeID").val(obj[0].hmainid);
+ $("#HQCSchemeName").val(obj[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem1();
+ }
+ //鐝
+ function GetHWorkShiftsValue(obj) {
+ $("#HShiftsName").val(obj[0].鐝鍚嶇О);
+ $("#HShiftsID").val(obj[0].HInterID);
+ }
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+ //璁￠噺鍗曚綅
+ function GetHUnitListValue(obj) {
+ $("#HUnitID").val(obj.HItemID);
+ $("#HUnit").val(obj.璁￠噺鍗曚綅鍚嶇О);
+ }
+ //妫�楠屽��
+ function GetHInspect1Value(obj) {
+ $("#HInspectValB").val(obj[0].HItemID);
+ $("#HInspectVal").val(obj[0].妫�娴嬪�煎悕绉�);
+ }
+ //妫�楠屽��
+ function GetHInspectValue(obj) {
+ $("#HTargetValB").val(obj.HItemID);
+ $("#HTargetVal").val(obj.妫�娴嬪�煎悕绉�);
+ $("#HUpLimit").val(obj.HItemID);
+ $("#HDownLimit").val(obj.妫�娴嬪�煎悕绉�);
+ }
+ //妫�楠岄」鐩�
+ function GetCheckItemValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屼华鍣�
+ function GetInspectInstruMentValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1