From 559f0a27985bc5be6965ba0a4c2bd6250df4f205 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:21:00 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 1396 ++++++++++++++++++++++++++--------------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 22
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 47 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 34 +
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 4
WebTM/WebTM.csproj | 2
7 files changed, 792 insertions(+), 717 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 604a435..571970f 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>07/20/2021 21:30:33</publishTime>
+ <publishTime>07/21/2021 14:07:54</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>07/20/2021 21:30:33</publishTime>
+ <publishTime>07/21/2021 14:07:54</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -633,7 +633,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>07/20/2021 23:24:33</publishTime>
+ <publishTime>07/21/2021 16:15:18</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1926,10 +1926,10 @@
<publishTime>03/29/2021 10:46:21</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>07/20/2021 17:07:50</publishTime>
+ <publishTime>07/20/2021 23:28:56</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>07/20/2021 17:07:50</publishTime>
+ <publishTime>07/20/2021 23:28:56</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
<publishTime>07/12/2021 15:38:26</publishTime>
@@ -2061,7 +2061,7 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>05/24/2021 10:08:23</publishTime>
+ <publishTime>07/21/2021 17:26:50</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>05/24/2021 10:08:23</publishTime>
@@ -2148,7 +2148,7 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>05/24/2021 10:08:23</publishTime>
+ <publishTime>07/21/2021 17:26:50</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>05/24/2021 10:08:23</publishTime>
@@ -2196,7 +2196,7 @@
<publishTime>07/19/2021 16:05:19</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>07/16/2021 13:35:42</publishTime>
+ <publishTime>07/21/2021 14:39:31</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>07/07/2021 10:49:01</publishTime>
@@ -2229,13 +2229,13 @@
<publishTime>07/19/2021 16:04:47</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>07/20/2021 19:37:19</publishTime>
+ <publishTime>07/21/2021 14:30:51</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
<publishTime>07/19/2021 16:04:47</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>07/20/2021 19:37:19</publishTime>
+ <publishTime>07/21/2021 14:30:51</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -2439,7 +2439,7 @@
<publishTime>03/29/2021 10:48:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/14/2021 13:25:37</publishTime>
+ <publishTime>07/21/2021 16:19:16</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 972565b..7e4c32f 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -651,8 +651,6 @@
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e8bcf45..7980c71 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃紝璇峰嬁鏇存敼
//var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣�
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
@@ -10,7 +10,7 @@
//var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
+ //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
return WEBURL
}
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 82eec43..b9b4a47 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"
@@ -24,6 +24,16 @@
margin-left: -15px;
margin-right: -15px;
}*/
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
@@ -32,27 +42,21 @@
<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-add-1 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="btnModify" id="btnModify">
- <i class="layui-icon layui-icon-edit 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="btnDelete" id="btnDelete">
- <i class="layui-icon layui-icon-delete 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="btnSave" id="btnSave">
- <i class="layui-icon layui-icon-delete 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-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-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
- <!--<ul class="layui-tab-title" lay-filter="tab-all">
+ <ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
- </ul>-->
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
@@ -72,12 +76,13 @@
</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="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: left;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>
@@ -85,261 +90,126 @@
<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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: left;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;padding: 9px 18px;">娴佽浆鍗″彿</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></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="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
+ <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-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" onmouseover="this.title=this.value" style="background-color:#efefef4d;">
- </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="HICMOInterID" id="HICMOInterID" style="background-color:#efefef4d;">
- <input type="hidden" name="HICMOID" id="HICMOID" value="0">
+ <input type="text" class="layui-input" name="HICMOInterID" id="HICMOInterID" 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>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;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="HInstockQty" id="HInstockQty" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" 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>
<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;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></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="HProcExchInterID" id="HProcExchInterID" onmouseover="this.title=this.value" style="background-color:#efefef4d;">
- </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="HBadQty" id="HBadQty" onmouseover="this.title=this.value" style="background-color:#efefef4d;">
- </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;">
- <input type="text" class="layui-input" name="HSourceID" id="HSourceID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </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="HEmpID" id="HEmpID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></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="HSortBillNo" id="HSortBillNo">
- </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="HCheckQty" id="HCheckQty" style="background-color:#efefef4d;">
- </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="HRightQty" id="HRightQty" style="background-color:#efefef4d;">
- </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="HProdTypeID" id="HProdTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ <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: left;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;">鐐夋壒鍙�</label>
+ <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="HLBatchNo" id="HLBatchNo" style="background-color:#efefef4d;">
+ <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;padding: 9px 18px;">瀹㈡埛</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HCusID" id="HCusID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </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="HRoutingInterID" id="HRoutingInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍚堝悓鎵瑰彿</label>
+ <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="HContrctBatchNo" id="HContrctBatchNo" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" 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="HProdAreaID" id="HProdAreaID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </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="HDrawingDireID" id="HDrawingDireID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </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="HProdStoveNo" id="HProdStoveNo" style="background-color:#efefef4d;">
- </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="HRecipeID" id="HRecipeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </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="HPackTypeID" id="HPackTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐩村緞1</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDiameter1" id="HDiameter1" style="background-color:#efefef4d;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐩村緞2</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDiameter2" id="HDiameter2" style="background-color:#efefef4d;">
- </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="HCheckerResult" id="HCheckerResult" style="background-color:#efefef4d;">
- </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;">
- <input type="text" class="layui-input" name="HFirstCheckEmpID" id="HFirstCheckEmpID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: left;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;">
+ <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: left;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 50%;">
<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="鍚堟牸" title="鍚堟牸" checked>
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="涓嶅悎鏍�" title="涓嶅悎鏍�">
+ </div>
+ </div>
+ </div>
</div>
</div>
- <!--鍏朵粬淇℃伅-->
+ <!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
<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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -347,53 +217,47 @@
<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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
</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="" id="" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
</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="" id="" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -408,27 +272,33 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
</script>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType">
+ <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>
</div>
-
+ <!--琛屾寜閽�-->
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <script type="text/html" id="HSupColor">
- {{# if(d.HSupFlag === "true"){ }}
- <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
- {{# } else { }}
- <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
- {{# } }}
+ <!--琛屼笅鎷夐�夋嫨(缁撹)-->
+ <script type="text/html" id="HResult">
+ <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
<script>
layui.config({
@@ -441,18 +311,26 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element
- , util = layui.util
- ;
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鍏敤鍙橀噺
+ var rowdata = [];
+ var option = [];
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
-
+ /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+ /* 1.鏃犳簮鍗曟柊澧�
+ * 2.鏈夋簮鍗曟柊澧�
+ * 3.缂栬緫
+ * 4.娴忚
+ * 5.鍙樻洿
+ */
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -465,58 +343,42 @@
return vars;
}
var params = getUrlVars();
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var HType = params[params[1]];//鍗曟嵁鐘舵��
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ }
+ /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
-
- if (HType == "Modify") {
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+ //鑾峰彇鏈�澶у崟鎹彿
$.ajax({
- url: GetWEBURL() + "/QC_ProcessCheckBill/xg",
- //url: "http://localhost:12761/QC_ProcessCheckBill/xg",
+ url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: {
- "HInterID": linterid
- },
+ data: { "HBillType": '7507' },
success: function (d) {
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ //console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HProcExchInterID").val(d.data[0].HProcExchInterID);
- $("#HProcExchEntryID").val(d.data[0].HProcExchEntryID);
- $("#HProcExchBillNo").val(d.data[0].HProcExchBillNo);
- $("#HMaterID").val(d.data[0].HMaterID);
- $("#HProcID").val(d.data[0].HProcID);
- $("#HSourceID").val(d.data[0].HSourceID);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HInStockQty").val(d.data[0].HInStockQty);
- $("#HCheckQty").val(d.data[0].HCheckQty);
- $("#HRightQty").val(d.data[0].HRightQty);
- $("#HBadQty").val(d.data[0].HBadQty);
- $("#HFirstCheckEmp").val(d.data[0].HFirstCheckEmp);
- $("#HCheckerResult").val(d.data[0].HCheckerResult);
- $("#HBarCode").val(d.data[0].HBarCode);
- $("#HLBatchNo").val(d.data[0].HLBatchNo);
- $("#HCusID").val(d.data[0].HCusID);
- $("#HSortBillNo").val(d.data[0].HSortBillNo);
- $("#HContrctBatchNo").val(d.data[0].HContrctBatchNo);
- $("#HProdAreaID").val(d.data[0].HProdAreaID);
- $("#HProdTypeID").val(d.data[0].HProdTypeID);
- $("#HProdStoveNo").val(d.data[0].HProdStoveNo);
- $("#HRecipeID").val(d.data[0].HRecipeID);
- $("#HDiameter1").val(d.data[0].HDiameter1);
- $("#HDiameter2").val(d.data[0].HDiameter2);
- $("#HRoutingInterID").val(d.data[0].HRoutingInterID);
- $("#HDrawingDireID").val(d.data[0].HDrawingDireID);
- $("#HPackTypeID").val(d.data[0].HPackTypeID);
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
}
-
});
}
- else {
+ else if (OperationType == 2) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
+ $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
+ $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
+ $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
+ $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
+ //鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
@@ -526,185 +388,269 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation();
+ }
+ else if (OperationType == 3) {
+ RoadBillMain(linterid);
+ //RoadBillSub(linterid);
+ }
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ function LoadingInformation() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ type: "GET",
+ data: { "sWhere": "and HInterID = " + linterid },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchInterID").val(data.HProcExchInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID);
+ $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HICMOBillNo").val(data.浠诲姟鍗�);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty);
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ $("#HProcID").val(data.HProcID);
+ } 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": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HResult": "",
+ "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btn-Exit)', function (data) {
+ get_Exit();
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(btn-AddNew)', function (data) {
+ window.location.reload();
+ });
+
+
+ //閫�鍑�
+ function get_Exit() {
+ if (OperationType == 1) {
+ parent.layui.admin.events.closeThisTabs();
+ } else if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (OperationType == 3) {
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ }
+ }
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HQCCheckItemID') //妯″叿淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠岄」鐩垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+ , HQCCheckItemID: checkStatus.data[0].HItemID
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(btnSave)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //淇濆瓨
+ function set_SaveBill(data) {
+ if ($("#HICMOQty").val() == "" || $("#HICMOQty").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;
+ }
+ var sSubTable = table.cache['mainTable'];
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HQCCheckItemID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveBill",
+ async: true,
+ 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(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#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: "娓╅Θ鎻愮ず" });
}
});
}
- ////鍒ゆ柇鏄惁鏂板
- //if (linterid == null || linterid == 0) {
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // data: { "HBillType": '7507' },
- // success: function (d) {
- // //console.log(d.data);
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- // }
- // });
- //}
- //else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- // $.ajax({
- // url: GetWEBURL() + "/QC_ProcessCheckBill/xg",
- // //url: "http://localhost:12761/QC_ProcessCheckBill/xg",
- // type: "GET",
- // data: {
- // "HInterID": linterid
- // },
- // success: function (d) {
- // ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HProcExchInterID").val(d.data[0].HProcExchInterID);
- // $("#HProcExchEntryID").val(d.data[0].HProcExchEntryID);
- // $("#HProcExchBillNo").val(d.data[0].HProcExchBillNo);
- // $("#HMaterID").val(d.data[0].HMaterID);
- // $("#HProcID").val(d.data[0].HProcID);
- // $("#HSourceID").val(d.data[0].HSourceID);
- // $("#HEmpID").val(d.data[0].HEmpID);
- // $("#HInStockQty").val(d.data[0].HInStockQty);
- // $("#HCheckQty").val(d.data[0].HCheckQty);
- // $("#HRightQty").val(d.data[0].HRightQty);
- // $("#HBadQty").val(d.data[0].HBadQty);
- // $("#HFirstCheckEmp").val(d.data[0].HFirstCheckEmp);
- // $("#HCheckerResult").val(d.data[0].HCheckerResult);
- // $("#HBarCode").val(d.data[0].HBarCode);
- // $("#HLBatchNo").val(d.data[0].HLBatchNo);
- // $("#HCusID").val(d.data[0].HCusID);
- // $("#HSortBillNo").val(d.data[0].HSortBillNo);
- // $("#HContrctBatchNo").val(d.data[0].HContrctBatchNo);
- // $("#HProdAreaID").val(d.data[0].HProdAreaID);
- // $("#HProdTypeID").val(d.data[0].HProdTypeID);
- // $("#HProdStoveNo").val(d.data[0].HProdStoveNo);
- // $("#HRecipeID").val(d.data[0].HRecipeID);
- // $("#HDiameter1").val(d.data[0].HDiameter1);
- // $("#HDiameter2").val(d.data[0].HDiameter2);
- // $("#HRoutingInterID").val(d.data[0].HRoutingInterID);
- // $("#HDrawingDireID").val(d.data[0].HDrawingDireID);
- // $("#HPackTypeID").val(d.data[0].HPackTypeID);
- // //table.reload(layTableId, {
- // // data: ajaxReturnData
- // //});
- // }
-
- // });
- //}
-
- //鍒濆鍔犺浇琛ㄦ牸
- //option.data = rowdata;
- //table.render(option);
-
-
-
-
-
- ////淇濆瓨鎻愪氦
- //form.on('submit(btnSave)', function (data) {//鎻愪氦
- // //var tableData = data.field;
- // var sMainStr = JSON.stringify(data.field);
- // var index = layer.load();
- // $.ajax({
- // type: "POST",
- // //url: GetWEBURL() + "/QC_ProcessCheckBill/AddBill",
- // url: "http://localhost:12761/QC_ProcessCheckBill/AddBill",
- // async: true,
- // data: { "sMainSub": sMainStr },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) {
- // layer.close(index);
- // layer.msg("鎻愪氦鎴愬姛");
- // }
- // 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: "娓╅Θ鎻愮ず" });
- // }
- // });
- //});
-
-
- //淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
- //var tableData = data.field;
- var sMainStr = JSON.stringify(data.field);
- var index = layer.load();
- if (HType == "Modify") {
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_ProcessCheckBill/AddBill1",
- async: true,
- data: { "oMain": sMainStr },
- 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(); });//鏂板
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
- }
- 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: "娓╅Θ鎻愮ず" });
- }
- });
- }
- else {
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_ProcessCheckBill/AddBill",
- async: true,
- data: { "oMain": sMainStr },
- 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(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- }
- 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: "娓╅Θ鎻愮ず" });
- }
- });
- }
- });
-
-
-
-
-
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
- {
+ //缂栬緫鏃跺姞杞借〃澶�
+ function RoadBillMain(linterid) {
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
type: "GET",
@@ -713,119 +659,253 @@
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
}
})
}
-
-
-
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchCheckProject)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟妗堝垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
+ $("#HQCCheckProjectName").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(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭璁″垝鍗曞垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ function get_CheckItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
+ success: function (result) {
+ option.data = result.data;
+ table.render(option);
}
})
+ }
+
+ //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
+ form.on('submit(btnSearchProcExch)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+ $("#HProcExchEntryID").val(checkStatus.data[0].hsubid);
+ $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
+ //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+ form.on('submit(btnSearchICMOBill)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇浠诲姟鍗曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
+ //琛ㄥご淇℃伅閫夋嫨妫�楠屽憳寮圭獥
+ form.on('submit(btnSearchHFirstCheckEmp)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+ $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
+ //琛ㄥご淇℃伅鐢熶骇璧勬簮寮圭獥
+ form.on('submit(btnSearchSource)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../PublicPage/SourceInformation.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ //琛ㄥご淇℃伅浜у搧寮圭獥
+ form.on('submit(btnSearchMater)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
- // }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
+
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -833,157 +913,79 @@
//window.close();//鍏抽棴褰撳墠椤�
})
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- });
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆琛ㄦ牸鏁版嵁
+ rowdata = [{
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HResult": "",
+ "HRemark": ""
+ }];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCRelValue', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HResult', title: '缁撹', templet: '#HResult' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option.data = rowdata;
+ table.render(option);
}
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ //琛岄�夋嫨澶勭悊锛堢粨璁猴級
+ form.on('select(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
- //}
- }
+ });
});
-
-
+ //浠ヤ笂涓簂ayui妯″潡
});
- //瀹氫箟鍏ㄥ眬鍙橀噺
- var HReasonName, ReasonID, EmpName, SQProcName,
- ProcID, ZRProcName, QRName
- ;
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
- function GetHPlanValue(obj) { //杩斿洖宸ュ簭璁″垝鍗�
- $("#HMainSourceInterID").val(obj[0].hmainid);
- $("#HMainSourceEntryID").val(obj[0].hsubid);
- $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HMaterID").val(obj[0].HMaterID);
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMater").val(obj[0].鐗╂枡鍚嶇О);
- $("#HCenterID").val(obj[0].HCenterID);
- $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績);
- $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
- $("#HPlanQty").val(obj[0].璁″垝鏁伴噺);
- }
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
- SQProcName = obj[0].宸ュ簭;
- ProcID = obj[0].HItemID;
- //$("#HSQProcName").val(obj[0].宸ュ簭);
- //$("#HProcID").val(obj[0].HItemID);
- }
- function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
- ZRProcName = obj[0].宸ュ簭;
- //$("#HZRProcName").val(obj[0].宸ュ簭);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //HWorker
- function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
- QRName = obj[0].HName;
- //$("#HQRName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- else {
- return true;
- }
- }
+ //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
+ var subProcName, subProcNumber, subProcID,
+ subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
+ subSupName, subSupNumber, subSupID,
+ HReasonName, ReasonID, EmpName,
+ ZRProcName, QRName;
+
+
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 67cc7fa..634f543 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -347,6 +347,7 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[1]];//婧愬崟id
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -390,8 +391,15 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- LoadingInformation();
+ if (HSouceBillType == 3722) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation2();
+ } else if (HSouceBillType == 3790) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation();
+ } else {
+ layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
+ }
}
else if (OperationType == 3) {
RoadBillMain(linterid);
@@ -433,6 +441,41 @@
}
});
}
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ function LoadingInformation2() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
+ type: "GET",
+ data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchInterID").val(data.HProcExchInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID);
+ $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HICMOBillNo").val(data.浠诲姟鍗�);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty);
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.HBillType);
+ $("#HMainSourceInterID").val(data.HInterID);
+ } 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')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 882ab23..baa66e1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -77,6 +77,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>
@@ -202,6 +203,9 @@
//鍙嶅鏍�
case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
break;
+ //宸ュ簭妫�
+ case 'btn-ProcessCheck': set_ProcessCheck();
+ break;
//棰勮
case 'btn-Cell': layer.msg('棰勮锛�');
break;
@@ -216,6 +220,34 @@
break;
};
});
+
+ //宸ュ簭妫�
+ function set_ProcessCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HInterID.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid, 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//鏂板鍗曟嵁
function set_AddNew() {
@@ -302,7 +334,7 @@
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/list',
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index c5db658..5c29d24 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -345,14 +345,14 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].HInterID.toString();
var OperationType = 2;
- var FirstPieceCheck = layer.open({
+ layer.open({
type: 2
, area: ['100%', '100%']
, title: '棣栦欢妫�楠屽崟-缂栬緫'
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid, 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=' + 3790, 'yes']
, resize: false
, cancel: function () {
btnIs();
--
Gitblit v1.9.1