From 1382e7f901677dce9db97ba25d9095668c1cb67f Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 10 三月 2021 19:49:36 +0800
Subject: [PATCH] 2021-03-10统一更新
---
WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html | 201 ++++++----
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 63 +++
WebTM/views/user/login.html | 12
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 83 ++++
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 52 ++
WebTM/layuiadmin/modules/common.js | 5
WebTM/views/车间管理/工序汇报/MES_StationOutBill.html | 0
WebTM/views/车间管理/工序汇报/MES_StationInBill.html | 0
WebTM/views/车间管理/工序汇报/MES_StationInBillList.html | 16
WebTM/views/车间管理/工序汇报/MES_StationOutBillList.html | 14
WebTM/views/home/console.html | 50 +-
/dev/null | 148 -------
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 63 +++
WebTM/views/车间管理/工序汇报/MES_StationInBill_PDA.html | 37 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 83 +++
WebTM/views/车间管理/工序汇报/MES_StationOutBill_PDA.html | 37 +
WebTM/views/index.html | 37 -
WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html | 8
WebTM/views/仓存管理/仓库调拨/Kf_LookingForBillList.html | 179 ++++----
WebTM/WebTM.csproj | 15
20 files changed, 651 insertions(+), 452 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index e36320b..c2b8181 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>02/24/2021 20:38:29</publishTime>
+ <publishTime>03/10/2021 18:20:18</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>02/24/2021 20:38:29</publishTime>
+ <publishTime>03/10/2021 18:20:18</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -535,7 +535,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="layuiadmin/modules/common.js">
- <publishTime>01/14/2021 10:06:24</publishTime>
+ <publishTime>03/10/2021 19:08:20</publishTime>
</File>
<File Include="layuiadmin/modules/console.js">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -583,7 +583,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>02/21/2021 23:22:54</publishTime>
+ <publishTime>03/10/2021 19:45:42</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -943,7 +943,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/home/console.html">
- <publishTime>02/24/2021 23:28:50</publishTime>
+ <publishTime>03/10/2021 18:27:44</publishTime>
</File>
<File Include="views/home/homepage1.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -955,7 +955,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>02/24/2021 22:41:59</publishTime>
+ <publishTime>03/10/2021 18:24:32</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1054,7 +1054,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>02/18/2021 16:27:56</publishTime>
+ <publishTime>03/05/2021 16:14:11</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1075,13 +1075,13 @@
<publishTime>11/26/2020 17:27:35</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBill.html">
- <publishTime>02/24/2021 17:31:17</publishTime>
+ <publishTime>03/09/2021 17:00:01</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBillList.html">
<publishTime>02/26/2021 21:06:26</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html">
- <publishTime>02/25/2021 14:27:14</publishTime>
+ <publishTime>03/09/2021 21:11:23</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html">
<publishTime>02/23/2021 11:59:48</publishTime>
@@ -1092,6 +1092,9 @@
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.html">
<publishTime>02/25/2021 14:28:42</publishTime>
</File>
+ <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_LookingForBillList.html">
+ <publishTime>03/10/2021 17:15:37</publishTime>
+ </File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
<publishTime>02/25/2021 16:14:07</publishTime>
</File>
@@ -1100,6 +1103,9 @@
</File>
<File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_UpMoveStockBill.html">
<publishTime>02/05/2021 16:57:13</publishTime>
+ </File>
+ <File Include="views/浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_WaitingLookingFor.html">
+ <publishTime>02/25/2021 14:28:42</publishTime>
</File>
<File Include="views/浠撳簱璋冩嫧/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1126,7 +1132,7 @@
<publishTime>01/14/2021 14:48:04</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>01/26/2021 13:03:12</publishTime>
+ <publishTime>03/03/2021 15:36:52</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
<publishTime>01/26/2021 00:32:20</publishTime>
@@ -1148,6 +1154,24 @@
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>01/21/2021 15:28:28</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill.html">
+ <publishTime>03/10/2021 18:01:22</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBillList.html">
+ <publishTime>03/10/2021 18:10:26</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
+ <publishTime>03/10/2021 18:57:30</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill.html">
+ <publishTime>03/10/2021 18:01:22</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBillList.html">
+ <publishTime>03/10/2021 18:08:53</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
+ <publishTime>03/10/2021 18:59:25</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
<publishTime>01/22/2021 16:21:03</publishTime>
@@ -1201,7 +1225,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
- <publishTime>02/26/2021 21:06:20</publishTime>
+ <publishTime>03/10/2021 17:51:39</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1225,7 +1249,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
- <publishTime>02/26/2021 19:01:53</publishTime>
+ <publishTime>03/10/2021 19:28:30</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1255,7 +1279,7 @@
<publishTime>03/04/2020 11:43:34</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
- <publishTime>02/20/2021 14:48:15</publishTime>
+ <publishTime>03/10/2021 19:28:55</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1270,7 +1294,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html">
- <publishTime>02/20/2021 14:48:02</publishTime>
+ <publishTime>03/10/2021 19:29:17</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html">
<publishTime>01/14/2021 10:06:24</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0e2d8d4..8919ae0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -414,26 +414,25 @@
<Content Include="views\user\user\userform.html" />
<Content Include="views\user\璇存槑.txt" />
<Content Include="views\涓嶈壇姹囨姤\Xs_SeOrderPickUp.html" />
- <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_WaitingLookingFor.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForReturnBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForReturnBill.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForBill.html" />
- <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Cc_LookingForBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_LookingForBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_UpMoveStockBill.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessDetail.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessList.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBill_PDA.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBill.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationInBillList.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill_PDA.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBill.html" />
- <Content Include="views\宸ュ簭姹囨姤\MES_StationOutBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillList.html" />
<Content Include="views\缁勮鍗昞Sc_AssemblyBill_Fast.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationInBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationInBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationOutBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭姹囨姤\MES_StationOutBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qk_OutProcessList.html" />
diff --git a/WebTM/layuiadmin/modules/common.js b/WebTM/layuiadmin/modules/common.js
index 2700bfc..9139964 100644
--- a/WebTM/layuiadmin/modules/common.js
+++ b/WebTM/layuiadmin/modules/common.js
@@ -31,7 +31,10 @@
//娓呯┖鏈湴璁板綍鐨� token锛屽苟璺宠浆鍒扮櫥鍏ラ〉
admin.exit(function(){
- location.href = 'user/login.html';
+ //location.href = 'user/login.html';
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.href = 'user/login.html';
+ });
});
}
});
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 5784b30..ad025d3 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -82,29 +82,35 @@
</a>
</li>
<li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.html" target="main_self_frame">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html" target="main_self_frame">
<i class="layui-icon layui-icon-find-fill"></i>
- <cite>寰呭彂鍖烘壘璐�</cite>
+ <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a href="../杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
</a>
</li>
<!--<li class="layui-col-xs3">
- <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
- <i class="layui-icon layui-icon-survey"></i>
- <cite>鍏朵粬鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
- <i class="layui-icon layui-icon-user"></i>
- <cite>鍏朵粬鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a lay-href="set/system/website.html">
- <i class="layui-icon layui-icon-set"></i>
- <cite>璁剧疆</cite>
- </a>
- </li>-->
+ <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
+ <i class="layui-icon layui-icon-survey"></i>
+ <cite>鍏朵粬鍏ュ簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
+ <i class="layui-icon layui-icon-user"></i>
+ <cite>鍏朵粬鍑哄簱</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="set/system/website.html">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>璁剧疆</cite>
+ </a>
+ </li>-->
</ul>
<!--<ul class="layui-row layui-col-space10">-->
<!--<li class="layui-col-xs3">
@@ -348,14 +354,14 @@
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js?t=1"></script>
- <script>
+ <!--<script src="../../layuiadmin/layui/layui.js?t=1"></script>-->
+ <!--<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'console']);
- </script>
+ </script>-->
</body>
</html>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e0d3cd8..5a2bd13 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>鏅轰簯LMES绠＄悊绯荤粺</title>
+ <title>LMES绠＄悊绯荤粺</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -100,7 +100,7 @@
<div class="layui-side layui-side-menu">
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
- <span>鏅轰簯LMES绠＄悊绯荤粺</span>
+ <span>LMES绠＄悊绯荤粺</span>
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -114,9 +114,9 @@
<!--<dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_UpMoveStockBill.html" target="main_self_frame">涓婃灦璋冩嫧鍗�</a></dd>-->
<dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame">涓嬫灦鎵捐揣鍗�</a></dd>
<dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">涓婃灦褰掕繕鍗�</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForBillList.html" target="main_self_frame">涓嬫灦鎵捐揣鍗曞垪琛�</a></dd>
- <dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html" target="main_self_frame">涓婃灦褰掕繕鍗曞垪琛�</a></dd>
- <dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.html" target="main_self_frame">寰呭彂鍖烘壘璐�</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_LookingForBillList.html" target="main_self_frame">鎵捐揣鍗曞垪琛�</a></dd>
+ <!--<dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html" target="main_self_frame">涓婃灦褰掕繕鍗曞垪琛�</a></dd>
+ <dd><a href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_WaitingLookingFor.html" target="main_self_frame">寰呭彂鍖烘壘璐�</a></dd>-->
</dl>
</dd>
</dl>
@@ -157,8 +157,15 @@
<a>鎶ヨ〃鍒嗘瀽</a>
<dl class="layui-nav-child">
<!--<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">杞﹂棿杩涘害璺熻釜琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">鐢熶骇宸ュ簭鏄庣粏琛�</a></dd>-->
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">鐢熶骇宸ュ簭鏄庣粏琛�</a></dd>-->
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">澧欏挃宸ヨ祫缁熻鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
+ <dd class="layui-nav-itemed">
+ <a>宸ュ簭姹囨姤</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</a></dd>
</dl>
</dd>
</dl>
@@ -219,16 +226,6 @@
<dd class="layui-this"><a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html" target="main_self_frame">鍏朵粬鍑哄簱(绾㈠瓧)</a></dd>
<!--<dd><a lay-href="缁勮鍗�/Sc_AssemblyBill_Fast.html">缁勮鍗�</a></dd>-->
<!-- <dd><a>鍙楁墭棰嗘枡</a></dd>-->
- </dl>
- </li>
- <li data-name="template" class="layui-nav-item">
- <a href="javascript:;" lay-tips="宸ュ簭姹囨姤" lay-direction="2">
- <i class="layui-icon layui-icon-user"></i>
- <cite>宸ュ簭姹囨姤</cite>
- </a>
- <dl class="layui-nav-child append" id="append">
- <dd><a lay-href="宸ュ簭姹囨姤/MES_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>
- <dd><a lay-href="宸ュ簭姹囨姤/MES_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</a></dd>
</dl>
</li>
<li data-name="template" class="layui-nav-item">
@@ -370,10 +367,10 @@
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
var judgeMorPCflag = judgeMorPC();
if (!judgeMorPCflag) {//绉诲姩绔�
- var dd = '<dd><a href="宸ュ簭姹囨姤/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+ var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
$("#append").prepend(dd);
} else {//PC绔�
- var dd = '<dd><a lay-href="宸ュ簭姹囨姤/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="宸ュ簭姹囨姤/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
+ var dd = '<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
$("#append").prepend(dd);
}
});
@@ -381,7 +378,7 @@
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
</script>
- <script>
+ <!--<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
@@ -389,7 +386,7 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
- </script>
+ </script>-->
</body>
</html>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 030344f..37b8613 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -64,6 +64,18 @@
, laydate = layui.laydate
, util = layui.util;
+ //鑾峰彇鏁版嵁搴撳悕
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetDataBases",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ sessionStorage["鏁版嵁搴�"] = result.data[0].Name;
+ }
+ layer.closeAll("loading");
+ }
+ })
+
//form.render();
//鎻愪氦
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
index 6cf5efd..089ec8f 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html"
@@ -214,10 +214,10 @@
, { field: 'HIsStatus', title: '鏄惁鎵爜' }
, { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
, { field: 'HSPID', title: '浠撲綅ID', hide: true }
- , { field: 'HSPName', title: '浠撲綅' }
+ , { field: 'HSPName', title: '浠撲綅', hide: true }
, { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 }
, { field: 'HWhID', title: '浠撳簱ID', hide: true }
- , { field: 'HWhName', title: '浠撳簱', width: 130 }
+ , { field: 'HWhName', title: '浠撳簱', width: 130, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
@@ -255,10 +255,10 @@
, { field: 'HIsStatus', title: '鏄惁鎵爜' }
, { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
, { field: 'HSPID', title: '浠撲綅ID', hide: true }
- , { field: 'HSPName', title: '浠撲綅' }
+ , { field: 'HSPName', title: '浠撲綅', hide: true }
, { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 }
, { field: 'HWhID', title: '浠撳簱ID', hide: true }
- , { field: 'HWhName', title: '浠撳簱', width: 130 }
+ , { field: 'HWhName', title: '浠撳簱', width: 130, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
index 7e19277..1e71bbb 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
@@ -115,14 +115,6 @@
</div>
<!--瀹炵墿涓婃灦-->
<div class="layui-tab-item layui-show">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">瀹炵墿鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -133,7 +125,7 @@
<input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs1">
- <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT" style="display:none;">...</button>
</div>
</div>
</div>
@@ -149,6 +141,14 @@
<div class="layui-col-xs1">
<button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
</div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">瀹炵墿鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
</div>
</div>
<table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
@@ -276,13 +276,13 @@
, cellMinWidth: 90
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
- //, { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true }
+ , { field: 'HIsStatus', title: '鏄惁鎵爜' }
, { field: 'HMTONo', title: '鎵瑰彿' }
, { field: 'HSPID', title: '浠撲綅ID', hide: true }
- , { field: 'HSPName', title: '浠撲綅' }
+ , { field: 'HSPName', title: '浠撲綅', hide: true }
, { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' }
, { field: 'HWhID', title: '浠撳簱ID', hide: true }
- , { field: 'HWhName', title: '浠撳簱', width: 130 }
+ , { field: 'HWhName', title: '浠撳簱', width: 130, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
@@ -315,8 +315,8 @@
option2.data = [];
table.render(option2);
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓�
- $("#HBarCode").focus();
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄤ粨浣嶄笂
+ $("#HSPName").focus();
//鎵簮鍗曪紙鍖呰鍗曟潯鐮侊級--寮冪敤
$('#HBarCode_Pack').on('keydown', function (event) {
@@ -435,59 +435,82 @@
//鎵疄鐗╂潯鐮�
$('#HBarCode').on('keydown', function (event) {
- var HBarCode = $('#HBarCode').val()
+ var HBarCode = $('#HBarCode').val();
if (event.keyCode == 13) {
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var sSubStr = result.data;
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HIsStatus == "鏄�") {
- layer.close(index);
- $('#HBarCode').val("");
- layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "鍦ㄥ簱") {
- layer.close(index);
- layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"锛屼笉鍏佽鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else {
- var data = result.data;
- option2.data = data;
- table.render(option2);
- sSubStr = table.cache['bzd-table2'];
- sSubStr[i].HIsStatus = "鏄�";
- sSubStr[i].HSourceID = $("#HSourceID").val();
- sSubStr[i].HSource = $("#HSource").val();
- sSubStr[i].HGroupID = $("#HGroupID").val();
- sSubStr[i].HGroup = $("#HGroup").val();
- sSubStr[i].HInterID = $("#HInterID").val();
- sSubStr[i].HBillNo = $("#HBillNo").val();
- sSubStr[i].HMakerID = $("#HMakerID").val();
- sSubStr[i].HMaker = $("#HMaker").val();
- option2.data = table.cache["bzd-table2"];
- table.render(option2);
- layer.close(index);
- $('#HBarCode').val("");
- layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ if ($("#HSPID").val() == 0) {
+ layer.msg("璇峰厛鎵弿浠撲綅鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ else
+ {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var sSubStr = result.data;
+ var tableStr = table.cache['bzd-table2'];
+ for (var i = 0; i < tableStr.length; i++) {
+ if (tableStr[i].HBarCode == sSubStr[0].HBarCode) {
+ layer.close(index);
+ $('#HBarCode').val("");
+ layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
}
- }
+ var last = tableStr.length;
+ //if (tableStr.length >0 && tableStr[i-1].HBarCode == sSubStr[0].HBarCode) {
+ // layer.close(index);
+ // $('#HBarCode').val("");
+ // layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //}
+ //else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "鍦ㄥ簱")
+ //{
+ // layer.close(index);
+ // layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"锛屼笉鍏佽鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //}
+ //else {
+ //var data = result.data;
+ option2.data.push(sSubStr[0]);
+ table.render(option2);
+ sSubStr = table.cache['bzd-table2'];
+ sSubStr[last].HIsStatus = "鏄�";
+ sSubStr[last].HSourceID = $("#HSourceID").val();
+ sSubStr[last].HSource = $("#HSource").val();
+ sSubStr[last].HGroupID = $("#HGroupID").val();
+ sSubStr[last].HGroup = $("#HGroup").val();
+ sSubStr[last].HInterID = $("#HInterID").val();
+ sSubStr[last].HBillNo = $("#HBillNo").val();
+ sSubStr[last].HMakerID = $("#HMakerID").val();
+ sSubStr[last].HMaker = $("#HMaker").val();
+ sSubStr[last].HSPName = $("#HSPName").val();
+ sSubStr[last].HSPID = $("#HSPID").val();
+ sSubStr[last].HWHID = $("#HWHID").val();
+ sSubStr[last].HWhName = $("#HWHName").val();
+ option2.data = table.cache["bzd-table2"];
+ table.render(option2);
+ layer.close(index);
+ $('#HBarCode').val("");
+ layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ //}
+ //}
- }
- else {
- option2.data = [];
- table.render(option2);
+ }
+ else {
+ option2.data = [];
+ table.render(option2);
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { 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: "娓╅Θ鎻愮ず" });
- }
- });
+ });
+ }
}
});
@@ -571,16 +594,16 @@
if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
{
//鍒ゆ柇涓婃灦搴撲綅鏄惁涓庢潯鐮佷腑搴撲綅涓�鑷�
- var tableData = table.cache['bzd-table2'];
- if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
- layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //var tableData = table.cache['bzd-table2'];
+ //if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
+ // layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
var index = layer.load();
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
+ url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
//url:"http://localhost:12761/LookingFor/set_SaveLookingForReturnBill_Json",
async: true,
data: { "oMain": sSubStr },
@@ -630,19 +653,35 @@
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var tableData = table.cache['bzd-table2'];
- if (tableData.length == 0) {
- layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
- layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else {
- $("#HSPName").val(result.data[0].HName);
- $("#HSPID").val(result.data[0].HItemID);
- $("#HWHID").val(result.data[0].HWHID);
- $("#HWHName").val(result.data[0].HWhName);
- }
+ //var tableData = table.cache['bzd-table2'];
+ //if (tableData.length == 0) {
+ // layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
+ // layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //} else {
+ $("#HSPName").val(result.data[0].HName);
+ $("#HSPID").val(result.data[0].HItemID);
+ $("#HWHID").val(result.data[0].HWHID);
+ $("#HWHName").val(result.data[0].HWhName);
+ //鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": $("#HWHID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWhID").val(result.data[0].HMESWHID);
+ $("#HWHName").val(result.data[0].HMESWHNAME);
+ $("#HBarCode").focus();
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_WaitingLookingFor.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_WaitingLookingFor.html"
deleted file mode 100644
index ff399e3..0000000
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_WaitingLookingFor.html"
+++ /dev/null
@@ -1,148 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>寰呭彂鍖烘壘璐�</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-</head>
-
-<body>
- <div class="layui-fluid" style="padding:0">
- <div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
- <div style="background-color:#0085E8;">
- <span style="color: white;"><i class="layui-icon layui-icon-form"></i>寰呭彂鍖烘壘璐�</span>
- </div>
- <div class="layui-form-item" style="padding:15px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="bzd-table" lay-filter="bzd-table"></table>
- </div>
- <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
- </div>
- </div>
- </div>
- </div>
- <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>
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //涓昏〃鍒楄〃
- var option = {
- elem: '#bzd-table'
- //, toolbar: '#toolbarDemo'
- , page: true
- //, height: 256
- //, cellMinWidth: 90
- , cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- , { field: '鎵瑰彿', title: '鎵瑰彿' }
- , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
- , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
- , { field: '浠撲綅ID', title: '浠撲綅ID', hide: true }
- , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', hide: true }
- , { field: '浠撲綅缂栫爜', title: '浠撲綅缂栫爜' }
- , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
- , { field: '婧愬崟鍙�', title: '婧愬崟鍙�' }
- ]]
- , text: {
- none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忓疄鐗╂潯鐮侊紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
- }
- };
-
-
- //鍒濆鍔犺浇琛ㄦ牸
- option.data = [];
- table.render(option);
-
-
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓�
- $("#HBarCode").focus();
-
- //鎵疄鐗╂潯鐮�
- $('#HBarCode').on('keydown', function (event) {
- var HBarCode = $('#HBarCode').val();
- if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg("璇锋壂鎻忔潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/LookingFor/GetWaitingLookingFor",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- option.data = data;
- table.render(option);
- layer.close(index);
- }
- else {
- option.data = [];
- table.render(option);
- layer.close(index);
- layer.msg("姝ゆ潯鐮佹棤璁板綍锛岃鎵弿姝ｇ‘鐨勬潯鐮侊紒", { 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: "娓╅Θ鎻愮ず" });
- }
- });
- layer.close(index);
- $('#HBarCode').val("");
- }
- });
-
-
-
- //閫�鍑烘寜閽�
- form.on('submit(Cancel)', function () {
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
-
- // 浠ヤ笂涓簂eyui妯″潡
- });
-
- </script>
-
-</body>
-</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_LookingForBillList.html"
similarity index 60%
rename from "WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html"
rename to "WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_LookingForBillList.html"
index 6af06c4..5e10fc2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_LookingForBillList.html"
@@ -2,14 +2,18 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>涓嬫灦鎵捐揣鍗曞垪琛�</title>
+<title>鎵捐揣鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
-
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -25,9 +29,10 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-block">
<select name="HBillType" id="HBillType">
+ <option value="">鎵�鏈�</option>
<option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
<option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
</select>
@@ -40,26 +45,19 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍙�</label>
+ <label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
+ <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
</div>
<div class="layui-inline">
@@ -99,79 +97,54 @@
<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/zgqCustom/zgqCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ , height: 'full-50'
, page: true
- ,cellMinWidth: 90
+ , cellMinWidth: 90
, cols: [[
- //{ field: 'hmainid', title: 'hmainid', width: 110 }
- { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
- //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- //, { field: 'hsubid', title: 'hsubid', width: 80 }
- , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
- , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- //, { field: 'hprocid', title: 'hprocid', width: 105 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- //, { field: 'HSupID', title: 'HSupID', width: 105 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
- , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- , { field: '鑹巼', title: '鑹巼' }
- , { field: '绱鑹巼', title: '绱鑹巼' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭'}
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�',width: 160 }
+ , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 200 }
+ , { field: 'HGroupID', title: '鐝粍ID', hide: true }
+ , { field: 'HGroup', title: '鐝粍' }
+ , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
+ , { field: 'HSource', title: '鐢熶骇璧勬簮', width: 115 }
+ , { field: 'HCreateBy', title: '鍒跺崟浜�' }
+ , {
+ field: 'HCreateDate', title: '鍒跺崟鏃堕棿', width: 110, templet: function (d) {
+ if (d.HCreateDate == null) {
+ return "";
+ }
+ return util.toDateString(d.HCreateDate, "yyyy-MM-dd");
+ }
+ }
+ , { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 130 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HBarCode', title: '鏉＄爜', width: 175 }
+ , { field: 'HBarCodeType', title: '鏉＄爜绫诲瀷' }
]]
};
@@ -179,9 +152,9 @@
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: GetWEBURL() + '/LookingFor/GetLookingForBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "HBillType": "" },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -195,48 +168,72 @@
layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#hnumber").val("");//鐗╂枡
- $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#HBillType").val("");//鍗曟嵁绫诲瀷
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSourceBillNo").val("");//婧愬崟鍙�
+ $("#HCreateBy").val("");//鍒跺崟浜�
+ $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
$("#btnSearch").click();
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
- var hnumber = $("#hnumber").val();//鐗╂枡
- var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- if (HOrderProcNO) {
- sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+ var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+ var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+ if (HBillNo) {
+ sWhere += " and HBillNo like '%" + HBillNo + "%'";
}
- if (hnumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ if (HCreateBy) {
+ sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
}
- if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ if (BenginHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
}
+ if (EndHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+ }
+ var index = layer.load(0);
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: GetWEBURL1() + '/LookingFor/GetLookingForBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "HBillType": HBillType },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
+ layer.close(index);
layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(index);
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+ //$("#HBillNo").val("");//鍗曟嵁鍙�
+ //$("#HSourceBillNo").val("");//婧愬崟鍙�
+ //$("#HCreateBy").val("");//鍒跺崟浜�
+ //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+ });
+
+ //鐩戝惉琛屽弻鍑讳簨浠�
+ table.on('rowDouble(mainTable)', function (obj) {
+ layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
});
@@ -251,7 +248,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
</script>
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
similarity index 100%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
similarity index 96%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
index 423a830..d48fc63 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
@@ -6,13 +6,13 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/layui/lay/modules/util.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>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/util.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>
</head>
<body>
@@ -127,7 +127,7 @@
</script>
<script>
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
similarity index 93%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
index a7d711e..f28bdf8 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
@@ -6,11 +6,11 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<style>
.layui-form-label {
font-size: 14px;
@@ -182,8 +182,8 @@
</div>
</div>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
- <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
function getUrlVars() {
@@ -201,7 +201,7 @@
var InterID = params[params[1]];
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -363,7 +363,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -379,7 +379,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -395,7 +395,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -416,9 +416,16 @@
success: function (result) {
console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#sHWHID").val("");
- layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
- window.location.reload();//鍒锋柊椤甸潰
+ //$("#sHWHID").val("");
+ //layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
+ // window.location.reload();//鍒锋柊椤甸潰
+ //});
+ layer.confirm(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), {
+ btn: ['鍑虹珯', '鏂板'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", icon: 1
+ }, function () {
+ parent.location.href = "../../../views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html";
+ }, function () {
+ window.location.reload();
});
}
else {
@@ -436,7 +443,7 @@
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../views/index.html";
+ parent.location.href = "../../../views/index.html";
});
});
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
similarity index 100%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
similarity index 96%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
index 68aa6fa..ca505be 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
@@ -6,12 +6,12 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <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>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <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>
</head>
<body>
@@ -88,7 +88,7 @@
</script>
<script>
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
similarity index 93%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
index 8ccaa3f..72a16e4 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
@@ -6,11 +6,11 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<style>
.layui-form-label {
font-size: 14px;
@@ -202,8 +202,8 @@
</div>
</div>
- <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
- <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
function getUrlVars() {
@@ -221,7 +221,7 @@
var InterID = params[params[1]];
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -393,7 +393,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -409,7 +409,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -425,7 +425,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -442,7 +442,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -466,8 +466,15 @@
console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#sHWHID").val("");
- layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
- window.location.reload();//鍒锋柊椤甸潰
+ //layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
+ // window.location.reload();//鍒锋柊椤甸潰
+ //});
+ layer.confirm(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), {
+ btn: ['杩涚珯', '鏂板'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", icon: 1
+ }, function () {
+ parent.location.href = "../../../views/杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html";
+ }, function () {
+ window.location.reload();
});
}
else {
@@ -485,7 +492,7 @@
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../views/index.html";
+ parent.location.href = "../../../views/index.html";
});
});
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 4769384..fae1203 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -35,9 +35,11 @@
<li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
<li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
- <li lay-id="5" style="padding:1px;">鏃ュ織</li>
+ <li lay-id="5" style="padding:1px;">婧愬崟鎵捐揣</li>
+ <li lay-id="6" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
+ <!--婧愬崟淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -63,6 +65,7 @@
</div>
</div>
</div>
+ <!--鍗曟嵁淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
@@ -174,17 +177,18 @@
</div>
</div>
</div>
+ <!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<!--<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>-->
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>-->
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -197,9 +201,15 @@
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
+ <!--鏄庣粏娓呭崟-->
<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
</div>
+ <!--婧愬崟鎵捐揣-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="zh-table" lay-filter="zh-table"></table>
+ </div>
+ <!--鏃ュ織-->
<div class="layui-tab-item">
<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
</div>
@@ -247,6 +257,29 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+
+ //婧愬崟鎵捐揣鍒楄〃
+ var ZHOption = {
+ elem: '#zh-table'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��',width:180 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '鎵规', title: '鎵规' }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔簮鍗曞彿锛�'
+ }
+ };
+ //鍒濆鍔犺浇琛ㄦ牸
+ ZHOption.data = [];
+ table.render(ZHOption);
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -980,6 +1013,36 @@
, done: function () {
}
});
+
+ //鎵簮鍗曟煡璐�
+ $('#HSourceBillNo').on('keydown', function (event) {
+ var HSourceBillNo = $('#HSourceBillNo').val();
+ if (event.keyCode == 13) {
+ var index = layer.load(0);
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
+ type: "GET",
+ data: { "HbillNo": HSourceBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ ZHOption.data = result.data;
+ table.render(ZHOption);
+ layer.close(index);
+ element.tabChange('tab-SellOutBill', '5');
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
});
function GetHWHValue(obj) //杩斿洖浠撳簱
{
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 1d65e24..362f7b4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -21,7 +21,17 @@
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">MES搴撲綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
@@ -84,8 +94,8 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
- <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
@@ -378,6 +388,8 @@
//}
//
//
+
+ //閫夋嫨浠撳簱
form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
type: 2
@@ -393,6 +405,8 @@
}
})
});
+
+ //閫夋嫨浠撲綅
form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
layer.open({
type: 2
@@ -408,6 +422,8 @@
}
})
});
+
+ //閫夋嫨淇濈
form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
layer.open({
type: 2
@@ -423,6 +439,8 @@
}
})
});
+
+ //閫夋嫨楠屾敹
form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
var sMainStr = JSON.stringify(data.field);
layer.open({
@@ -439,6 +457,8 @@
}
})
});
+
+ //閫夋嫨閮ㄩ棬
form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
layer.open({
type: 2
@@ -454,6 +474,8 @@
}
})
});
+
+ //缂栬緫
form.on('submit(cmdModify)', function () {//缂栬緫
var sSubStr = table.cache['wl-table'];
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
@@ -539,6 +561,14 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
//debugger;
+ if ($("#HExplanation").val() == "") {
+ if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+ $("#HWHNAME").val("");
+ $("#HWHID").val("");
+ layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
//var sSourceType = $("#HBillType").val();
@@ -632,7 +662,7 @@
type: "GET",
data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
success: function (result) {
- debugger;
+ //debugger;
if (result.count == 1) {
if (result.data.HBarType == '浠撳簱鏉＄爜') {
$("#HWHNAME").val(result.data.HWhName);
@@ -745,6 +775,8 @@
//layer.closeAll("loading");
//}
});
+
+ //鎵簮鍗�
$('#HSourceBillNo').on('keydown', function (event) { //鎵簮鍗�
var HSourceBillNo = $('#HSourceBillNo').val()
var sInterID = $("#HInterID").val()
@@ -802,6 +834,7 @@
}
});
+ //鎵粨浣�
$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
var HBarCode = $('#HStockPlaceName').val()
if (event.keyCode == 13) {
@@ -828,6 +861,48 @@
});
}
});
+
+ //鎵玀ES浠撲綅
+ $('#HMESSPName').on('keydown', function (event) { //鎵粨浣�
+ var HBarCode = $('#HMESSPName').val();
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HMESSPID").val(result.data[0].HWHID);
+ $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+ $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": result.data[0].HWHID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWHID").val(result.data[0].HMESWHID);
+ $("#HWHNAME").val(result.data[0].HMESWHNAME);
+ $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+ $("#HMESSPName").css("background-color", "#efefef4d");
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index fe8ccbc..0bef8b6 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -26,6 +26,16 @@
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">MES搴撲綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
@@ -87,7 +97,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -617,7 +627,14 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- //debugger;
+ if ($("#HExplanation").val() == "") {
+ if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+ $("#HWHNAME").val("");
+ $("#HWHID").val("");
+ layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
var sSourceType = $("#HBillType").val();
@@ -934,6 +951,48 @@
, done: function () {
}
});
+
+ //鎵玀ES浠撲綅
+ $('#HMESSPName').on('keydown', function (event) { //鎵粨浣�
+ var HBarCode = $('#HMESSPName').val();
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HMESSPID").val(result.data[0].HWHID);
+ $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+ $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": result.data[0].HWHID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWHID").val(result.data[0].HMESWHID);
+ $("#HWHNAME").val(result.data[0].HMESWHNAME);
+ $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+ $("#HMESSPName").css("background-color", "#efefef4d");
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
});
function GetHWHValue(obj) //杩斿洖璋冨叆浠撳簱
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 015dd73..8153781 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -21,6 +21,16 @@
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">MES搴撲綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
</div>
<div class="layui-col-xs8">
@@ -84,7 +94,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
@@ -499,7 +509,14 @@
//鎻愪氦鎸夐挳
form.on('submit(Saver)', function (data) {
- //debugger;
+ if ($("#HExplanation").val() == "") {
+ if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+ $("#HWHNAME").val("");
+ $("#HWHID").val("");
+ layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
var sSourceType = $("#HBillType").val();
@@ -829,6 +846,48 @@
, done: function () {
}
});
+
+ //鎵玀ES浠撲綅
+ $('#HMESSPName').on('keydown', function (event) { //鎵粨浣�
+ var HBarCode = $('#HMESSPName').val();
+ if (event.keyCode == 13) {
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HMESSPID").val(result.data[0].HWHID);
+ $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+ $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": result.data[0].HWHID },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWHID").val(result.data[0].HMESWHID);
+ $("#HWHNAME").val(result.data[0].HMESWHNAME);
+ $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+ $("#HMESSPName").css("background-color", "#efefef4d");
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
});
//娓呯┖琛ㄥご
//function f_ClearTitle() {
--
Gitblit v1.9.1