From 46b10d520f13e5aa34cc0b02bae3aff58166981a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 21 一月 2021 20:27:14 +0800
Subject: [PATCH] 登录用户信息增加工序号，工序汇报页面优化
---
WebTM/views/user/login.html | 25
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 30
WebTM/views/工序汇报/MES_StationInBill_PDA.html | 86 +-
WebTM/views/工序汇报/MES_StationInBillList.html | 65
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 232 +++++
WebTM/views/工序汇报/MES_StationOutBill_PDA.html | 284 ++++---
WebTM/views/工序汇报/MES_StationOutBill.html | 1038 ++++++++++---------------
WebTM/views/工序汇报/MES_StationOutBillList.html | 88 -
WebTM/views/Baseset/基础资料/Gy_WorkCenterList.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 8
WebTM/views/index.html | 164 ++-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 259 ++++++
WebTM/WebTM.csproj | 2
13 files changed, 1,313 insertions(+), 972 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 802a4b1..459f87f 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>01/18/2021 10:04:21</publishTime>
+ <publishTime>01/21/2021 11:58:12</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>01/18/2021 10:04:21</publishTime>
+ <publishTime>01/21/2021 11:58:12</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -580,7 +580,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>01/19/2021 14:13:36</publishTime>
+ <publishTime>01/21/2021 11:35:01</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -742,7 +742,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html">
- <publishTime>01/19/2021 14:12:23</publishTime>
+ <publishTime>01/19/2021 22:26:49</publishTime>
</File>
<File Include="views/component/anim/index.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -952,7 +952,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>01/14/2021 17:44:54</publishTime>
+ <publishTime>01/21/2021 20:23:40</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1051,7 +1051,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>01/15/2021 11:10:33</publishTime>
+ <publishTime>01/21/2021 19:29:19</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1084,22 +1084,28 @@
<publishTime>01/14/2021 14:48:04</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBillList.html">
- <publishTime>01/14/2021 15:07:03</publishTime>
+ <publishTime>01/21/2021 20:21:06</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
- <publishTime>01/19/2021 15:03:45</publishTime>
+ <publishTime>01/21/2021 20:16:54</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill.html">
- <publishTime>01/14/2021 15:28:59</publishTime>
+ <publishTime>01/19/2021 22:22:31</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBillList.html">
- <publishTime>01/14/2021 15:07:10</publishTime>
+ <publishTime>01/21/2021 20:21:21</publishTime>
</File>
<File Include="views/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
- <publishTime>01/18/2021 14:39:27</publishTime>
+ <publishTime>01/21/2021 20:18:12</publishTime>
+ </File>
+ <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
+ <publishTime>01/21/2021 15:23:36</publishTime>
</File>
<File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
+ </File>
+ <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
+ <publishTime>01/21/2021 15:28:28</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1210,7 +1216,7 @@
<publishTime>05/08/2020 23:33:42</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/18/2021 08:57:06</publishTime>
+ <publishTime>01/21/2021 11:58:13</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cf3f9ee..5208101 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -422,7 +422,9 @@
<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\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_FastList.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBackBill_Fast.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ce9310f..4b657c8 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://124.70.129.242/WebAPI/"; //闆呯惇璇�
- var WEBURL = "http://localhost:8084/WebAPI/";
+ var WEBURL = "http://124.70.129.242/WebAPI/"; //闆呯惇璇�
+ //var WEBURL = "http://localhost:8084/WebAPI/";
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
@@ -9,8 +9,8 @@
function GetWEBURL1() {
//var WEBURL = 'http://192.168.16.80:8011/'; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
- var WEBURL = 'http://localhost:8084/WebAPI/';
+ var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
+ //var WEBURL = 'http://localhost:8084/WebAPI/';
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
index 35c17cf..1835b90 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
@@ -60,8 +60,8 @@
, cols: [[
{ type: 'radio' }
, { field: 'HItemID', title: 'HItemID', hide: true }
- , { field: '鐢熶骇鐝粍浠ｇ爜', width: 110, title: '鐢熶骇鐝粍浠ｇ爜' }
- , { field: '鐢熶骇鐝粍', width: 110, title: '鐢熶骇鐝粍', sort: true }
+ , { field: '宸ヤ綔涓績浠ｇ爜', width: 110, title: '宸ヤ綔涓績浠ｇ爜' }
+ , { field: '宸ヤ綔涓績', width: 110, title: '宸ヤ綔涓績', sort: true }
]]
, page: true
});
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 8639afd..12be0ee 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -4,7 +4,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>鏉＄爜</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">
@@ -99,43 +99,58 @@
<div class="layui-side layui-side-menu">
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
- <span>鏉＄爜涓氬姟娴佺▼</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">
-
- <!--<li data-name="component" class="layui-nav-item">
- <a href="javascript:;" lay-tips="鍒拌揣纭" lay-direction="2">
- <i class="layui-icon layui-icon-home"></i>
- <cite>鍒拌揣纭</cite>
- </a>
- </li>-->
- <li data-name="template" class="layui-nav-item">
- <a href="javascript:;" lay-tips="楠屾敹鍏ュ簱" lay-direction="2">
- <i class="layui-icon layui-icon-component"></i>
- <cite>楠屾敹鍏ュ簱</cite>
- </a>
- <dl class="layui-nav-child">
- <dd><a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">澶栬喘鍏ュ簱</a></dd>
- <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html" target="main_self_frame">澶栬喘鍏ュ簱(绾㈠瓧)</a></dd>-->
- <dd><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">濮斿鍏ュ簱</a></dd>
- <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBill.html" target="main_self_frame">濮斿鍏ュ簱(绾㈠瓧)</a></dd>-->
- <dd><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">浜у搧鍏ュ簱</a></dd>
- <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html" target="main_self_frame">浜у搧鍏ュ簱(绾㈠瓧)</a></dd>-->
- <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame">鍏朵粬鍏ュ簱</a></dd>
- <dd class="layui-this"><a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html" target="main_self_frame">鍏朵粬鍏ュ簱(绾㈠瓧)</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-template"></i>
- <cite>鐢熶骇绠＄悊</cite>
+ <li data-name="set" class="layui-nav-item">
+ <a><i class="layui-icon layui-icon-set"></i><cite>璁″垝绠＄悊</cite></a>
+ <dl class="layui-nav-child">
+ <dd class="layui-nav-itemed">
+ <a>宸ヨ壓璺嚎</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </li>
+ <li data-name="set" class="layui-nav-item">
+ <a><i class="layui-icon layui-icon-set"></i><cite>鐢熶骇绠＄悊</cite></a>
+ <dl class="layui-nav-child">
+ <dd class="layui-nav-itemed">
+ <a>鐢熶骇浠诲姟鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇浠诲姟鍗曞垪琛�</a></dd>
+ </dl>
+ </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-component"></i>
+ <cite>楠屾敹鍏ュ簱</cite>
</a>
- <dl class="layui-nav-child">
- <dd class="layui-this"><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮鍗�</a></dd>
- <dd class="layui-this"><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Xs_SeOrderPickUp_New.html" target="main_self_frame">涓嶈壇姹囨姤</a></dd>
- </dl>-->
-<!--</a>-->
+ <dl class="layui-nav-child">
+ <dd><a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">澶栬喘鍏ュ簱</a></dd>
+ <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html" target="main_self_frame">澶栬喘鍏ュ簱(绾㈠瓧)</a></dd>-->
+ <dd><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">濮斿鍏ュ簱</a></dd>
+ <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBill.html" target="main_self_frame">濮斿鍏ュ簱(绾㈠瓧)</a></dd>-->
+ <dd><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">浜у搧鍏ュ簱</a></dd>
+ <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html" target="main_self_frame">浜у搧鍏ュ簱(绾㈠瓧)</a></dd>-->
+ <!--<dd class="layui-this"><a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame">鍏朵粬鍏ュ簱</a></dd>
+ <dd class="layui-this"><a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html" target="main_self_frame">鍏朵粬鍏ュ簱(绾㈠瓧)</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-template"></i>
+ <cite>鐢熶骇绠＄悊</cite>
+ </a>
+ <dl class="layui-nav-child">
+ <dd class="layui-this"><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮鍗�</a></dd>
+ <dd class="layui-this"><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Xs_SeOrderPickUp_New.html" target="main_self_frame">涓嶈壇姹囨姤</a></dd>
+ </dl>-->
+ <!--</a>-->
</li>-->
<li data-name="template" class="layui-nav-item">
<a href="javascript:;" lay-tips="棰嗘枡鍙戣揣" lay-direction="2">
@@ -152,10 +167,9 @@
<dd><a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">閿�鍞嚭搴�</a></dd>
<!--<dd class="layui-this"><a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame">閿�鍞嚭搴�(绾㈠瓧)</a></dd>-->
<!--<dd class ="layui-this"><a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame">鍏朵粬鍑哄簱</a></dd>
- <dd class="layui-this"><a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html" target="main_self_frame">鍏朵粬鍑哄簱(绾㈠瓧)</a></dd>-->
+ <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>-->
+ <!-- <dd><a>鍙楁墭棰嗘枡</a></dd>-->
</dl>
</li>
<li data-name="template" class="layui-nav-item">
@@ -200,49 +214,49 @@
<dd><a href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBillList.html" target="main_self_frame">浜у搧鍏ュ簱鍗曠孩瀛楃紦瀛樺垪琛�</a></dd>
<dd><a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_FastList.html" target="main_self_frame">鍏朵粬鍏ュ簱鍗曠孩瀛楃紦瀛樺垪琛�</a></dd>
<dd><a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html" target="main_self_frame">澶栬喘鍏ュ簱鍗曠孩瀛楃紦瀛樺垪琛�</a></dd>
- <dd><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBillList.html" target="main_self_frame">濮斿鍏ュ簱鍗曠孩瀛楃紦瀛樺垪琛�</a></dd>
+ <dd><a href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBillList.html" target="main_self_frame">濮斿鍏ュ簱鍗曠孩瀛楃紦瀛樺垪琛�</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-senior"></i>
- <cite>閫�璐ф壂鎻�</cite>
- </a>
- </li>-->
+ <a href="javascript:;" lay-tips="閫�璐ф壂鎻�" lay-direction="2">
+ <i class="layui-icon layui-icon-senior"></i>
+ <cite>閫�璐ф壂鎻�</cite>
+ </a>
+ </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">
- <dd><a href="浠撳簱璋冩嫧/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">璋冩嫧鍗�</a></dd>
- <dd><a>棰嗘枡璋冩嫧</a></dd>
- </dl>
- </li>-->
+ <a href="javascript:;" lay-tips="浠撳簱璋冩嫧" lay-direction="2">
+ <i class="layui-icon layui-icon-user"></i>
+ <cite>浠撳簱璋冩嫧</cite>
+ </a>
+ <dl class="layui-nav-child">
+ <dd><a href="浠撳簱璋冩嫧/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">璋冩嫧鍗�</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-set"></i>
- <cite>鐩樼偣璋冩嫧</cite>
- </a>
- </li>
- <li data-name="template" class="layui-nav-item">
- <a href="javascript:;" lay-tips="鏉＄爜鏌ヨ" lay-direction="2">
- <i class="layui-icon layui-icon-template"></i>
- <cite>鏉＄爜鏌ヨ</cite>
- </a>
- </li>-->
- <!--<li data-name="set" class="layui-nav-item">
- <a href="javascript:;" lay-tips="璁剧疆" lay-direction="2">
- <i class="layui-icon layui-icon-set"></i>
- <cite>涓绘帶鍙�</cite>
- </a>
- </li>-->
+ <a href="javascript:;" lay-tips="鐩樼偣璋冩嫧" lay-direction="2">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>鐩樼偣璋冩嫧</cite>
+ </a>
+ </li>
+ <li data-name="template" class="layui-nav-item">
+ <a href="javascript:;" lay-tips="鏉＄爜鏌ヨ" lay-direction="2">
+ <i class="layui-icon layui-icon-template"></i>
+ <cite>鏉＄爜鏌ヨ</cite>
+ </a>
+ </li>-->
<!--<li data-name="set" class="layui-nav-item">
- <a href="javascript:;" lay-tips="璁剧疆" lay-direction="2">
- <i class="layui-icon layui-icon-set"></i>
- <cite>鍩虹璧勬枡</cite>
- </a>
- </li>-->
+ <a href="javascript:;" lay-tips="璁剧疆" lay-direction="2">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>涓绘帶鍙�</cite>
+ </a>
+ </li>-->
+ <!--<li data-name="set" class="layui-nav-item">
+ <a href="javascript:;" lay-tips="璁剧疆" lay-direction="2">
+ <i class="layui-icon layui-icon-set"></i>
+ <cite>鍩虹璧勬枡</cite>
+ </a>
+ </li>-->
<li data-name="set" class="layui-nav-item">
<a href="javascript:;" lay-tips="璁剧疆" lay-direction="2">
<i class="layui-icon layui-icon-set"></i>
@@ -313,7 +327,7 @@
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 {
- var dd = '<dd><a lay-href="宸ュ簭姹囨姤/MES_StationInBill.html" target="main_self_frame">宸ュ簭杩涚珯姹囨姤鍗�</a ></dd > <dd><a lay-href="宸ュ簭姹囨姤/MES_StationOutBill.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);
}
});
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index fb29d45..a81c4d5 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -99,6 +99,16 @@
sessionStorage["HSupName"] = result.data[0].HSupName;
sessionStorage["Czmm"] = result.data[0].Czmm;
sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
//sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
window.location.href = '../../views/index.html'
@@ -132,7 +142,7 @@
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(result.Message, { icon: 1 });
- sessionStorage["HUserName"] = UserName;
+ sessionStorage["HUserName"] = result.data[0].Czymc;;
sessionStorage["HBillerID"] = result.data[0].HK3UserID;
sessionStorage["SourceFlag"] = false;
sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
@@ -149,6 +159,19 @@
sessionStorage["HSPName"] = result.data[0].HSPName;
sessionStorage["HSupID"] = result.data[0].HSupID;
sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["Czmm"] = result.data[0].Czmm;
+ sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+
//sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
window.location.href = '../../views/index.html'
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
index e7a00f0..37b5f39 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
@@ -144,47 +144,44 @@
,height: 'full-50'
, page: true
, cols: [[
- //{ field: 'hmainid', title: 'hmainid', width: 85 }
- { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 110 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 110 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鐢熶骇璁㈠崟', title: '鐢熶骇璁㈠崟', width: 175 }
- , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿', width: 170 }
- //, { field: 'HMaterID', title: 'HMaterID', width: 95 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 165 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 220 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 95 }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', width: 80 }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 95 }
- //, { field: 'HProcID', title: 'HProcID', width: 90 }
- , { field: '宸ュ簭', title: '宸ュ簭', width: 95 }
- //, { field: 'HEmpID', title: 'HEmpID', width: 90 }
- , { field: '鎺ユ敹浜�', title: '鎺ユ敹浜�', width: 80 }
- , { field: '杩涚珯鎺ユ敹鏁伴噺', title: '杩涚珯鎺ユ敹鏁伴噺', width: 120 }
- , { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 182 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 80 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 182 }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 80 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 182 }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 105 }
+ //{ field: 'HEmpID', title: 'HEmpID', sort: true, width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', width: 110 }
+ //, { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165 }
+ //, { field: 'HProcID', title: 'HProcID', width: 175 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 170 }
+ { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 120 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ //, { field: 'hmainid', title: 'hmainid', width: 160 }
+ //, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
+ //, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 80 }
+ //, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 80 }
+ //, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
+
]]
};
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationInBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- console.log(data1)
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationInBillList;
table.render(option);
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
layer.msg("鎺ュ彛璇锋眰澶辫触!", {
@@ -248,16 +245,16 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationInBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationInBillList;
table.render(option);
layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
index 2b55ef2..84188d9 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
@@ -97,7 +97,7 @@
<input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ヨ繘绔欐暟閲�">
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
<input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
@@ -214,15 +214,26 @@
//鑾峰彇褰撳墠鏃堕棿澶勭悊
$("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HEmp").val(sessionStorage["HUserName"]);
- $("#HEmpID").val(sessionStorage["Czybm"]);
+ $("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+ $("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
+ $("#HProcID").val(sessionStorage["HProcName"]);
+ $("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+ $("#HSourceID").val(sessionStorage["HSourceID"]);
+ $("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ $("#HCenter").val(sessionStorage["HWorkCenter"]);//宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HProcNo").val(sessionStorage["HProcNo"]);//娴佹按鍙�
+
+
//椤甸潰鍒濆鍖栬祴鍊�
//鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- //data: { "HBillType": '3790' },
+ data: { "billType": '3790' },
success: function (d) {
$("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
$("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
@@ -233,10 +244,6 @@
$("#HBarCode").focus();
$("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
- $("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
- $("#Serial_number").css("background-color", "#efefef4d");
- $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
- $("#Entrants_number").css("background-color", "#efefef4d");
//鎵潯褰㈢爜鏂规硶
@@ -248,7 +255,6 @@
layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
- //
$.ajax({
url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
type: "GET",
@@ -256,19 +262,19 @@
"sBillBarCode": HBarCode
},
success: function (result) {
- var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HProcExchBillNo": $("#HBarCode").val()
- , "HProcID": data.HProcID
- , "HProc": data.宸ュ簭
- , "HCenter": data.宸ヤ綔涓績
- , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ //, "HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
, "HICMOInterID": data.hicmointerid
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HDeptID": data.HDeptID
, "HQty": data.璁″垝鏁伴噺
- , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
, "HMaterName": data.浜у搧
, "HMaterModel": data.瑙勬牸鍨嬪彿
, "HICMOQty": data.鐢熶骇鏁伴噺
@@ -277,12 +283,8 @@
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
$("#HBarCode").css("box-shadow", "none");
- $("#HProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
- $("#HProcNo").css("background-color", "white");
- $("#HProcNo").focus();
- $("#HProcNo").css("box-shadow", "0 0 0 1px #00ff00");
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
@@ -311,15 +313,15 @@
var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcID": data.HProcID
- , "HProc": data.宸ュ簭
- , "HCenter": data.宸ヤ綔涓績
- , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
- , "HICMOInterID": data.hicmointerid
+ //"HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ "HICMOInterID": data.hicmointerid
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HDeptID": data.HDeptID
, "HQty": data.璁″垝鏁伴噺
- , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
, "HMaterName": data.浜у搧
, "HMaterModel": data.瑙勬牸鍨嬪彿
, "HICMOQty": data.鐢熶骇鏁伴噺
@@ -327,7 +329,7 @@
$("#HProcNo").css("box-shadow", "none");
checkPopup();
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
@@ -402,12 +404,10 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
//debugger;
var sMainStr =data.field;
- console.log(sMainStr);
$.ajax(
{
type: "POST",
- //url: GetWEBURL() + "/api/newBill/setStationInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: "http://localhost:12761/api/newBill/setStationInBill",
+ url: GetWEBURL() + "/api/newBill/setStationInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: sMainStr,
dataType: "json",
@@ -434,16 +434,16 @@
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs();
+ parent.location.href = "../../views/index.html";
});
});
//鏂板鎸夐挳
- //form.on('submit(HAddBT)', function (data) {//閫�鍑�
- // layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- // window.location.reload();
- // });
- //});
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
@@ -460,10 +460,11 @@
//鏍￠獙鏄惁閫夋嫨寮圭獥浜嬩欢
function checkPopup() {
- if (!$("#HSource").val()) {
- $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
- }
- else if (!$("#HGroup").val()) {
+ //if (!$("#HSource").val()) {//鐢熶骇璧勬簮
+ // $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+ //}
+ //else
+ if (!$("#HGroup").val()) {
$("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
}
else if (!$("#HCenter").val()) {
@@ -484,6 +485,7 @@
}
}
+ //杩斿洖鐢熶骇璧勬簮
function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
if ($("#HSource").val()) {
$("#HSource").css("box-shadow", "none");
@@ -497,9 +499,9 @@
//杩斿洖宸ヤ綔涓績
function GetWorkCenterValue(obj) { //杩斿洖宸ヤ綔涓績
if (obj.length == 0) {
- layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+ layer.msg("璇峰厛閫夋嫨宸ヤ綔涓績", { index: 0 });
} else {
- $("#HCenter").val(obj[0].鐢熶骇鐝粍);
+ $("#HCenter").val(obj[0].宸ヤ綔涓績);
$("#HCenterID").val(obj[0].HItemID);
$("#HCenter").css("box-shadow", "none");
checkPopup();
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
index 9af730b..e5231ca 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill.html"
@@ -8,451 +8,201 @@
<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>
<style>
.layui-form-label {
font-size: 14px;
width: 85px;
text-align: inherit;
}
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ }
</style>
</head>
<body>
- <div class="layui-fluid">
+ <div class="layui-fluid" style="padding:0">
<div class="layui-card">
<!--<div class="layui-card-header"></div>-->
- <div class="layui-card-body" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 0;">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-form-item" style="margin-bottom: 20px;">
+ <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="margin: 1% 0;text-align: right;">
<button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
- <!--<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <!--<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">鍝佽川鍒ゆ柇</button>-->
- <button type="button" lay-submit="" lay-filter="Refresh" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" onclick="check();">娴嬭瘯</button>
</div>
<div class="layui-form-item">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline">
- <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
- <legend>宸ュ簭鍑虹珯姹囨姤鍗�</legend>
- </fieldset>
- </div>
- <div class="layui-col-xs1 layui-inline">
- <img src="222.jpg" style="width:70%;height:50%;" />
- </div>
- <div class="layui-inline">
- <div class="">
- <label class="layui-inline" style="width:60px;">鏉″舰鐮�</label>
- <div class="layui-inline">
- <input type="text" style="border-radius: 50px;width:254%" name="鏉″舰鐮�" id="HFbarcode" lay-verify="HFbarcode" autocomplete="off" placeholder="璇疯緭鍏ユ潯褰㈢爜" class="layui-input">
- </div>
- </div>
- <div class="">
- <label class="layui-inline" style="width:60px;">娴佹按鍙�</label>
- <div class="layui-inline">
- <input type="text" style="border-radius: 50px;" name="娴佹按鍙�" id="Serial_number" lay-verify="Serial_number" autocomplete="off" placeholder="璇疯緭鍏ユ祦姘村彿" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-inline" style="width:60px;">鍚堟牸鏁伴噺</label>
- <div class="layui-inline">
- <input type="text" style="border-radius: 50px;" name="鍚堟牸鏁伴噺" id="QualifiedQuantity" lay-verify="sQty" autocomplete="off" placeholder="璇疯緭鍏ユ祦姘村彿" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-inline" style="width:60px;">鎶ュ簾鏁伴噺</label>
- <div class="layui-inline">
- <input type="text" style="border-radius: 50px;" name="鎶ュ簾鏁伴噺" id="ScrapQuantity" lay-verify="HBarCode" autocomplete="off" placeholder="璇疯緭鍏ヨ繘绔欐暟閲�" class="layui-input">
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!--鍑虹珯淇℃伅&鍏朵粬淇℃伅-->
- <div class="layui-form-item">
- <div class="layui-col-md8 layui-card-body layui-inline">
- <div class="layui-tab">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li data-status="" class="layui-this">鍑虹珯淇℃伅</li>
- <li data-status="2">鍏朵粬淇℃伅</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show" style="height:250px;">
- <table>
- <tbody>
- <tr>
- <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
- <td>
- <input type="text" name="娴佽浆鍗″彿" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="娴佽浆鍗″彿鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:90px;padding:10px">姹囨姤鏃堕棿</th>
- <td>
- <input type="text" class="layui-input" id="HDateNow" style="background-color:#efefef4d;width:120px" readonly>
- </td>
- <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
- <td>
- <input type="text" name="鐢熶骇璁㈠崟鍙�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="杩涚珯鏃堕棿" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
- <td>
- <input type="text" name="浜у搧浠ｇ爜" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="浜у搧浠ｇ爜" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
- <td>
- <input type="text" name="浜у搧鍚嶇О" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
- <td>
- <input type="text" name="瑙勬牸鍨嬪彿" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="瑙勬牸鍨嬪彿" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
- <td>
- <input type="text" name="璁￠噺鍗曚綅" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="璁￠噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">浜у搧绫诲瀷</th>
- <td>
- <input type="text" name="浜у搧绫诲瀷" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="浜у搧绫诲瀷" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">姹囨姤绫诲瀷</th>
- <td>
- <input type="text" name="姹囨姤绫诲瀷" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="姹囨姤绫诲瀷" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
- <td>
- <input type="text" name="娴佽浆鍗℃暟閲�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="娴佽浆鍗℃暟閲�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
- <td>
- <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
- <td>
- <input type="text" name="鍗曟嵁鍙�" id="HBillNo2" lay-verify="HBillNo2" autocomplete="off" placeholder="鍗曟嵁鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鍗曟嵁鍙稩D" id="HInterID" lay-verify="HInterID">
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
- <td>
- <input type="text" name="璁㈠崟璺熻釜鍙�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">鎿嶄綔鍛�2</th>
- <td>
- <input type="text" name="鎿嶄綔鍛�2" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎿嶄綔鍛�2" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鎿嶄綔鍛�3</th>
- <td>
- <input type="text" name="鎿嶄綔鍛�3" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎿嶄綔鍛�3" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鎿嶄綔鍛�4</th>
- <td>
- <input type="text" name="鎿嶄綔鍛�4" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎿嶄綔鍛�4" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">鎿嶄綔鍛�5</th>
- <td>
- <input type="text" name="鎿嶄綔鍛�5" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎿嶄綔鍛�5" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="layui-tab-item" style="height:250px;">
- <table>
- <tbody>
- <tr>
- <th style="width:80px;padding:10px">鍒跺崟浜�</th>
- <td>
- <input type="text" name="鍒跺崟浜�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
- <td>
- <input type="text" name="鍒跺崟鏃ユ湡" class="layui-input" id="HDateNow" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">淇敼浜�</th>
- <td>
- <input type="text" name="淇敼浜�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
- <td>
- <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="HDateNow" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">瀹℃牳浜�</th>
- <td>
- <input type="text" name="瀹℃牳浜�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
- <td>
- <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="HDateNow" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px"></th>
- <td></td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">杩涚珯PNL鏁�</th>
- <td>
- <input type="text" name="杩涚珯PNL鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="杩涚珯PNL鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">杩涚珯PSC鏁�</th>
- <td>
- <input type="text" name="杩涚珯PSC鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="杩涚珯PSC鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">鎶ュ簾PNL鏁�</th>
- <td>
- <input type="text" name="鎶ュ簾PNL鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎶ュ簾PNL鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鏈哄彴</th>
- <td>
- <input type="text" name="鏈哄彴" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鏈哄彴" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">鎶樺集鍒�鏁�</th>
- <td>
- <input type="text" name="鎶樺集鍒�鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鎶樺集鍒�鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">鍝佽川纭浜�</th>
- <td>
- <input type="text" name="鍝佽川纭浜�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="鍝佽川纭浜�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">NCT鍐叉鏁�</th>
- <td>
- <input type="text" name="NCT鍐叉鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="NCT鍐叉鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">NCT鍗曟</th>
- <td>
- <input type="text" name="NCT鍗曟" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="NCT鍗曟" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- <tr>
- <th style="width:80px;padding:10px">绉讳氦PNL鏁�</th>
- <td>
- <input type="text" name="绉讳氦PNL鏁�" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="绉讳氦PNL鏁�" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- <th style="width:80px;padding:10px">绯绘暟</th>
- <td>
- <input type="text" name="绯绘暟" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="绯绘暟" class="layui-input" style="background-color:#efefef4d" readonly>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
- <!--鏈珯淇℃伅-->
- <div class="layui-inline" style="padding-left:5px;border:1px solid #e6e6e6;width:28%">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label">鏈珯淇℃伅</label>
- </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-xs6">
- <input type="text" name="褰撳墠宸ュ簭" id="HWorkShopName" lay-verify="HWorkShopName" autocomplete="off" placeholder="閫夋嫨褰撳墠宸ュ簭" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="褰撳墠宸ュ簭浠ｇ爜" id="HWorkShopID" lay-verify="HWorkShopID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkShop-BT">...</button>
- </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-xs6">
- <input type="text" name="宸ヤ綔涓績" id="HProcName" lay-verify="HProcName" autocomplete="off" placeholder="閫夋嫨宸ヤ綔涓績" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="宸ヤ綔涓績浠ｇ爜" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkingProcedure-BT">...</button>
- </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-xs6">
- <input type="text" name="鐢熶骇杞﹂棿" id="HScOrgName" lay-verify="HScOrgName" autocomplete="off" placeholder="閫夋嫨鐢熶骇杞﹂棿" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鐢熶骇杞﹂棿浠ｇ爜" id="HScOrgID" lay-verify="HScOrgID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOrganization-BT">...</button>
- </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-xs6">
- <input type="text" name="鐢熶骇缁勭粐" id="HOrganization" lay-verify="HOrganization" autocomplete="off" placeholder="閫夋嫨鐢熶骇缁勭粐" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鐢熶骇缁勭粐浠ｇ爜" id="HOrganizationID" lay-verify="HOrganizationID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOrganization-BT">...</button>
- </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-xs6">
- <input type="text" name="鎿嶄綔鍛�" id="Operator" lay-verify="Operator" autocomplete="off" placeholder="閫夋嫨鎿嶄綔鍛�" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鎿嶄綔鍛樹唬鐮�" id="OperatorID" lay-verify="OperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="Operator-BT">...</button>
- </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-xs6">
- <input type="text" name="鐢熶骇鐝粍" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨鐢熶骇鐝粍" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鐢熶骇鐝粍浠ｇ爜" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="鐢熶骇璧勬簮" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨鐢熶骇璧勬簮" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鐢熶骇璧勬簮浠ｇ爜" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="鏍哥畻宸ュ簭" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨鏍哥畻宸ュ簭" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="鏍哥畻宸ュ簭浠ｇ爜" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="妫�楠屽憳" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨妫�楠屽憳" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="妫�楠屽憳浠ｇ爜" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="HOperatorName" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨宸ユ椂" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="HOperatorID" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="HOperatorName" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨璁惧娓呭崟" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="HOperatorID" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </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-xs6">
- <input type="text" name="HOperatorName" id="HOperatorName" lay-verify="HOperatorName" autocomplete="off" placeholder="閫夋嫨妯＄┐鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
- <input type="hidden" name="HOperatorID" id="HOperatorID" lay-verify="HOperatorID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOperator-BT">...</button>
- </div>
- </div>
- </div>
- </div>
- <!--寰呭嚭绔欏伐鍗�&浠婃棩鍑虹珯-->
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-tab">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li data-status="" class="layui-this">寰呭嚭绔欏伐鍗�</li>
- <li data-status="2">浠婃棩鍑虹珯</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-row">
- <div class="layui-col-xs12">
- <table class="layui-hide" id="djs-table" lay-filter="djs-table"></table>
- </div>
- </div>
- </div>
- <div class="layui-tab-item">
- <div class="layui-row">
- <div class="layui-col-xs12">
- <table class="layui-hide" id="jr-table" lay-filter="jr-table"></table>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="t1_input">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>娴佽浆鍗″彿</th>
+ <td class="t1_input">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭鍚嶇О</th>
+ <td class="t1_input">
+ <input type="text" name="HProc" class="layui-input" id="HProc" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒涘缓浜�</th>
+ <td class="t1_input">
+ <input type="text" class="layui-input" id="HEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鍚堟牸鏁伴噺</th>
+ <td class="t1_input">
+ <input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
+ </td>
+ </tr>
+ <tr>
+ <th>宸ユ椂</th>
+ <td class="t1_input">
+ <input type="text" name="HWorkTimes" class="layui-input" id="HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�">
+ </td>
+ </tr>
+ <tr>
+ <th>鎶ュ簾鏁伴噺</th>
+ <td class="t1_input">
+ <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇鐝粍</th>
+ <td class="bz_td">
+ <input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ヤ綔涓績</th>
+ <td class="bz_td">
+ <input type="text" name="HCenter" class="layui-input" id="HCenter" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>妫�楠屽憳</th>
+ <td class="bz_td">
+ <input type="text" name="HQCCheck" class="layui-input" id="HQCCheck" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鍑虹珯鍗曞彿</th>
+ <td class="t1_input">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ嚭绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
+ </td>
+ </tr>
+ <tr>
+ <th>鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="date" name="HStationOutTime" class="layui-input" id="HStationOutTime" placeholder="璇烽�夋嫨鏃ユ湡">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟</th>
+ <td class="t1_input">
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterID" class="layui-input" id="HMaterID" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>璁㈠崟璺熻釜鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟鏁伴噺</th>
+ <td class="t1_input">
+ <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HICMOInterID" class="layui-input" id="HICMOInterID"><!--浠诲姟鍗曞彿ID鍙杊icmointerid-->
+ <input type="hidden" name="HDeptID" class="layui-input" id="HDeptID"><!--鐢熶骇杞﹂棿id-->
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
</form>
</div>
</div>
- </div>
-
+ </div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
- <script type="text/html" id="wl-BT">
- <a class="layui-btn layui-btn-xs HEdit" lay-event="DeleteOne">鍒犻櫎</a>
- </script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
function getUrlVars() {
@@ -475,158 +225,128 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
var $ = layui.$
- , admin = layui.admin
- , element = layui.element
- , layer = layui.layer
- , laydate = layui.laydate
- , table = layui.table
- , form = layui.form;
-
+ , admin = layui.admin
+ , element = layui.element
+ , layer = layui.layer
+ , table = layui.table
+ , laydate = layui.laydate
+ , form = layui.form;
//鑾峰彇褰撳墠鏃堕棿澶勭悊
- var data = new Date();
- var year = data.getFullYear(); //鑾峰彇骞�
- var month = data.getMonth() + 1; //鑾峰彇鏈�
- var day = data.getDate(); //鑾峰彇鏃�
- var time = year + "-" + month + "-" + day;
+ $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmp").val(sessionStorage["HUserName"]);
+ $("#HEmpID").val(sessionStorage["Czybm"]);
//椤甸潰鍒濆鍖栬祴鍊�
//鑾峰彇鍗曟嵁鍙�
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- data: { "HBillType": '3791' },
+ //data: { "HBillType": '3790' },
success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo2").val(d.data[0].HBillNo);
+ $("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
+ $("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
}, error: function () {
layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
}
});
- $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
-
- $("#HFbarcode").focus();
- $("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HBarCode").focus();
+ $("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
$("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
$("#Serial_number").css("background-color", "#efefef4d");
- $("#QualifiedQuantity").attr("readonly", "readonly");//鍚堟牸鏁伴噺鍙
- $("#QualifiedQuantity").css("background-color", "#efefef4d");
- $("#ScrapQuantity").attr("readonly", "readonly");//鎶ュ簾鏁伴噺鍙
- $("#ScrapQuantity").css("background-color", "#efefef4d");
+ $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
+ $("#Entrants_number").css("background-color", "#efefef4d");
+
//鎵潯褰㈢爜鏂规硶
- $('#HFbarcode').on('keydown', function (event) { //鎵潯褰㈢爜
- var HFbarcode = $('#HFbarcode').val();
+ $('#HBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
- if (HFbarcode == "") {
+ if (HBarCode == "") {
layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
//
$.ajax({
- url: GetWEBURL() + "/LEMS/TxtHBarCode_KeyDown",
+ url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
type: "GET",
data: {
- "sBillBarCode": HFbarcode
+ "sBillBarCode": HBarCode
},
success: function (result) {
- var data = result.data;
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
- , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
- , "浜у搧鍚嶇О": data[0].浜у搧
- , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
- , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
- , "鍒跺崟浜�": data[0].鍒跺崟浜�
- , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
- , "淇敼浜�": data[0].淇敼浜�
- , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
- , "瀹℃牳浜�": data[0].瀹℃牳浜�
- , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
- , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
- , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
- , "娴佽浆鍗″彿": $("#HFbarcode").val()
+ "HProcExchBillNo": $("#HBarCode").val()
+ , "HProcID": data.HProcID
+ , "HProc": data.宸ュ簭
+ , "HCenter": data.宸ヤ綔涓績
+ , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ , "HICMOInterID": data.hicmointerid
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.璁″垝鏁伴噺
+ , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鐢熶骇鏁伴噺
+ , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
});
- $("#HFbarcode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- $("#HFbarcode").css("background-color", "#efefef4d");
- $("#HFbarcode").css("box-shadow", "none");
- $("#Serial_number").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
- $("#Serial_number").css("background-color", "white");
- $("#Serial_number").focus();
- $("#Serial_number").css("box-shadow", "0 0 0 1px #00ff00");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
+ $("#HBarCode").css("box-shadow", "none");
+ $("#HProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
+ $("#HProcNo").css("background-color", "white");
+ $("#HProcNo").focus();
+ $("#HProcNo").css("box-shadow", "0 0 0 1px #00ff00");
} else {
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
}
});
- // layer.msg($('#HFbarcode').val(), { icon: 1 });
}
});
//娴佹按鍙峰洖杞︽柟娉�
- $('#Serial_number').on('keydown', function (event) { //鎵潯褰㈢爜
- var sProcNo = $('#Serial_number').val();
- var sBillNo = $('#HBillNo').val();
+ $('#HProcNo').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HProcNo = $('#HProcNo').val();
+ var HBarCode = $('#HBarCode').val();
if (event.keyCode == 13) {
- if (sProcNo == "" || sBillNo == "") {
+ if (HProcNo == "" || HBarCode == "") {
layer.alert("娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
$.ajax({
- url: GetWEBURL() + "/LEMS/TxtHProcNo_KeyDown",
+ url: GetWEBURL() + "/api/newBill/getProcDetail",
type: "GET",
data: {
- "sProcNo": sProcNo
- , "sBillNo": sBillNo
+ "sBillNo": HBarCode
+ , "sProcNo": HProcNo
},
success: function (result) {
- var data = result.data;
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
- , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
- , "浜у搧鍚嶇О": data[0].浜у搧
- , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
- , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
- , "宸ヤ綔涓績": data[0].宸ヤ綔涓績
- , "宸ヤ綔涓績浠ｇ爜": data[0].宸ヤ綔涓績浠ｇ爜
- , "褰撳墠宸ュ簭": data[0].宸ュ簭
- , "褰撳墠宸ュ簭浠ｇ爜": data[0].宸ュ簭浠ｇ爜
- , "鐢熶骇杞﹂棿": data[0].鐢熶骇杞﹂棿
- , "鐢熶骇杞﹂棿浠ｇ爜": data[0].鐢熶骇杞﹂棿浠ｇ爜
- , "鎿嶄綔鍛�": data[0].鎿嶄綔宸�
- , "鎿嶄綔鍛樹唬鐮�": data[0].鎿嶄綔宸ヤ唬鐮�
- , "鐢熶骇鐝粍": data[0].鐝粍
- , "鐢熶骇鐝粍浠ｇ爜": data[0].鐝粍浠ｇ爜
- , "鐢熶骇璧勬簮": data[0].鐢熶骇璧勬簮
- , "鐢熶骇璧勬簮浠ｇ爜": data[0].鐢熶骇璧勬簮浠ｇ爜
- , "鍒跺崟浜�": data[0].鍒跺崟浜�
- , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
- , "淇敼浜�": data[0].淇敼浜�
- , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
- , "瀹℃牳浜�": data[0].瀹℃牳浜�
- , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
- , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
- , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
- , "娴佽浆鍗″彿": $("#HFbarcode").val()
+ "HProcID": data.HProcID
+ , "HProc": data.宸ュ簭
+ , "HCenter": data.宸ヤ綔涓績
+ , "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ , "HICMOInterID": data.hicmointerid
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.璁″垝鏁伴噺
+ , "HMaterID": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鐢熶骇鏁伴噺
});
- $("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
- $("#Serial_number").css("background-color", "#efefef4d");
- $("#Serial_number").css("box-shadow", "none");
- $("#QualifiedQuantity").removeAttr("readonly");//绉婚櫎鍚堟牸鏁伴噺鍙
- $("#QualifiedQuantity").css("background-color", "white");
- $("#QualifiedQuantity").focus();
- $("#QualifiedQuantity").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HProcNo").css("box-shadow", "none");
+ checkPopup();
} else {
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
@@ -637,41 +357,88 @@
});
//鍚堟牸鏁伴噺鍥炶溅鏂规硶
- $('#QualifiedQuantity').on('keydown', function (event) {
+ $('#HQty').on('keydown', function (event) {
if (event.keyCode == 13) {
- $("#QualifiedQuantity").attr("readonly", "readonly");//鍚堟牸鏁伴噺鍙
- $("#QualifiedQuantity").css("background-color", "#efefef4d");
- $("#QualifiedQuantity").css("box-shadow", "none");
- $("#ScrapQuantity").removeAttr("readonly");//绉婚櫎鎶ュ簾鏁伴噺鍙
- $("#ScrapQuantity").focus();
- $("#ScrapQuantity").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HQty").css("box-shadow", "none");
+ checkPopup();
+ }
+ });
+
+ //宸ユ椂鍥炶溅鏂规硶
+ $('#HWorkTimes').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HWorkTimes").css("box-shadow", "none");
+ checkPopup();
}
});
//鎶ュ簾鏁伴噺鍥炶溅鏂规硶
- $('#ScrapQuantity').on('keydown', function (event) {
+ $('#HWasterQty').on('keydown', function (event) {
if (event.keyCode == 13) {
- $("#ScrapQuantity").attr("readonly", "readonly");//鎶ュ簾鏁伴噺鍙
- $("#ScrapQuantity").css("background-color", "#efefef4d");
- $("#ScrapQuantity").css("box-shadow", "none");
- if ($("#Operator").val()) {
- $("#Operator").css("box-shadow", "none");
- } else {
- $("#Operator").css("box-shadow", "1px 1px 1px 2px #00ff00");
- }
+ $("#HWasterQty").css("box-shadow", "none");
+ checkPopup();
}
});
- //閫夋嫨鎿嶄綔鍛樺脊绐�
- form.on('submit(Operator-BT)', function () {//閫夋嫨浠撲綅
+ //閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
layer.open({
type: 2
- , area: ['60%', '60%']
- , title: '鏈珯宸ュ簭'
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝粍'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨宸ヤ綔涓績寮圭獥
+ form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ヤ綔涓績'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨妫�楠屽憳
+ form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨妫�楠屽憳
+ var sMainStr = JSON.stringify(data.field);
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '妫�楠屽憳鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -679,103 +446,136 @@
})
});
- //閫夋嫨鐢熶骇缁勭粐寮圭獥
- form.on('submit(HOrganization-BT)', function () {//閫夋嫨鐢熶骇缁勭粐
- layer.open({
- type: 2
- , area: ['60%', '60%']
- , title: '鐢熶骇缁勭粐'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../Baseset/鍩虹璧勬枡/Gy_OrgList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //debugger;
+ var sMainStr = data.field;
+ console.log(sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/api/newBill/setStationOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ //url:"http://localhost:12761/api/newBill/setStationOutBill",
+ async: true,
+ data: sMainStr,
+ dataType: "json",
+ success: function (result) {
+ console.log(result);
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#sHWHID").val("");
+ layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
+ window.location.reload();//鍒锋柊椤甸潰
+ });
+ }
+ else {
+ layer.alert(result.msg, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ layui.form.render();
+ },
+ error: function (err) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触:" + err, { icon: 5 });
+ }
+ });
});
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs();
+ parent.location.href = "../../views/index.html";
});
});
- //寰呮帴鏀跺伐鍗曢〉绛�
- table.render({
- elem: '#djs-table'
- , url: GetWEBURL1() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cols: [[
- { field: 'HInterID', title: '搴忓彿' }
- , { field: 'HBillNo', title: '鐘舵��', sort: true }
- , { field: 'HMaker', title: '鐢熶骇璁㈠崟' }
- , { field: 'HMakeDate', title: '璁″垝鏃ユ湡' }
- , { field: 'HQty', title: '鐗╂枡缂栫爜' }
- , { field: 'HSourceBillNo', title: '鐗╂枡鍚嶇О' }
- , { field: 'HRedBlueFlag', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HSourceBillType', title: '璁″垝鏁伴噺' }
- , { field: 'HSourceBillType', title: '宸叉眹鎶ユ暟閲�' }
- , { field: 'HSourceBillType', title: '宸插叆搴撴暟閲�' }
- ]]
- , height: 300
- , done: function () {
- layer.closeAll("loading");
- }
+ //鏂板鎸夐挳
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
});
- //浠婃棩杩涚珯椤电
- table.render({
- elem: '#jr-table'
- , url: GetWEBURL1() + '/Web/DisBillEntryList_Mate_Webs_Json'
- , cellMinWidth: 100
- , cols: [[
- { field: 'HInterID', title: '搴忓彿',width:80 }
- , { field: 'HBillNo', title: '姹囨姤鏃ユ湡', width: 110, sort: true }
- , { field: 'HMaker', title: '鐢熶骇姹囨姤鍗曞彿' }
- , { field: 'HMakeDate', title: '鐢熶骇璁㈠崟鍙�' }
- , { field: 'HQty', title: '鐗╂枡缂栫爜' }
- , { field: 'HSourceBillNo', title: '鐗╂枡鍚嶇О' }
- , { field: 'HRedBlueFlag', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HSourceBillType', title: '璁″垝鏁伴噺' }
- , { field: 'HSourceBillType', title: '姹囨姤鏁伴噺' }
- , { field: 'HSourceBillType', title: '鍒跺崟浜�' }
- , { field: 'HSourceBillType', title: '鍒跺崟鏃ユ湡' }
- ]]
- , height: 300
- , done: function () {
- layer.closeAll("loading");
- }
- });
-
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+ //鍘熺敓js鍒濆鍖�
+ $(function () {
});
-
-
- function GetOrgValue(obj) //杩斿洖鐢熶骇缁勭粐
- {
- $("#HOrganization").val(obj[0].HName);
- $("#HOrganizationID").val(obj[0].HNumber);
+ //鏍￠獙鏄惁閫夋嫨寮圭獥浜嬩欢
+ function checkPopup() {
+ if (!$("#HQty").val()) {
+ $("#HQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HQty").focus();
+ }
+ else if (!$("#HWorkTimes").val()) {
+ $("#HWorkTimes").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HWorkTimes").focus();
+ }
+ else if (!$("#HWasterQty").val()) {
+ $("#HWasterQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HWasterQty").focus();
+ }
+ else if (!$("#HSource").val()) {
+ $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+ $("#HSource").focus();
+ }
+ else if (!$("#HGroup").val()) {
+ $("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
+ $("#HGroup").focus();
+ }
+ else if (!$("#HCenter").val()) {
+ $("#HCenter").css("box-shadow", "0 0 1px 2px #00ff00");
+ $("#HCenter").focus();
+ }
}
- function GetHWorkerValue(obj) //杩斿洖鎿嶄綔鍛�
- {
- $("#Operator").val(obj[0].HName);
- $("#OperatorID").val(obj[0].HItemID);
+ //杩斿洖鐢熶骇鐝粍
+ function GetProductionTeamValue(obj) { //杩斿洖鐢熶骇鐝粍
+ if (obj.length == 0) {
+ layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+ } else {
+ $("#HGroup").val(obj[0].鐝粍);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HGroup").css("box-shadow", "none");
+ checkPopup();
+ layer.closeAll();
+ }
}
- //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
- //{
- // $("#HDeptName").val(obj[0].HName);
- // $("#HDeptID").val(obj[0].HItemID);
- //}
+
+ //杩斿洖鐢熶骇璧勬簮
+ function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
+ if ($("#HSource").val()) {
+ $("#HSource").css("box-shadow", "none");
+ }
+ $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ $("#HSource").css("box-shadow", "none");
+ checkPopup();
+ }
+
+ //杩斿洖宸ヤ綔涓績
+ function GetWorkCenterValue(obj) { //杩斿洖宸ヤ綔涓績
+ if (obj.length == 0) {
+ layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+ } else {
+ $("#HCenter").val(obj[0].宸ヤ綔涓績);
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenter").css("box-shadow", "none");
+ checkPopup();
+ layer.closeAll();
+ }
+ }
+
+ //杩斿洖妫�楠屽憳
+ function GetHSecManagerValue(obj) { //杩斿洖妫�楠屽憳
+ $("#HQCCheck").val(obj[0].HName);
+ $("#HQCCheckID").val(obj[0].HItemID);
+ }
</script>
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
index 152336a..69789d2 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
@@ -106,68 +106,44 @@
,height: 'full-50'
, page: true
, cols: [[
- { field: '閫夋嫨', title: '閫夋嫨', width: 110 }
- //, { field: 'hmainid', title: 'hmainid', width: 110 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 175 }
- , { field: '妫�楠屽憳', title: '妫�楠屽憳', width: 170 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 165 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
- //, { field: 'HProcExchInterID', title: 'HProcExchInterID', width: 220 }
- , { field: '瀹㈡埛鏉＄爜', title: '瀹㈡埛鏉＄爜', width: 95 }
- , { field: '瀹㈡埛鏉＄爜NEW', title: '瀹㈡埛鏉＄爜NEW', width: 80 }
- , { field: '鎵规鍙�', title: '鎵规鍙�', width: 95 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 95 }
- //, { field: 'HProcID', title: 'HProcID', width: 80 }
- , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 120 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 182 }
- //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 182 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 80 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 182 }
- //, { field: 'HunitID', title: 'HunitID', width: 105 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 105 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 105 }
- , { field: '妯＄┐鍙�', title: '妯＄┐鍙�', width: 105 }
- , { field: '鐗╂枡杈呭姪1', title: '鐗╂枡杈呭姪1', width: 105 }
- , { field: '鐗╂枡杈呭姪2', title: '鐗╂枡杈呭姪2', width: 105 }
- , { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105 }
- //, { field: 'HEmpID', title: 'HEmpID', width: 105 }
- , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 105 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
- , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 105 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 105 }
- , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', width: 105 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 105 }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 105 }
- , { field: '宸ユ椂', title: '宸ユ椂', width: 105 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 105 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 105 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 105 }
- //, { field: 'HSubID', title: 'HSubID', width: 105 }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 105 }
- //, { field: 'HBillType', title: 'HBillType', width: 105 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 105 }
+ { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 120 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ //,{ field: 'HEmpID', title: 'HEmpID', width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', sort: true, width: 165 }
+ //, { field: 'HMaterID', title: 'HMaterID', width: 175 }
+ //, { field: 'HProcID', title: 'HProcID', width: 170 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 165 }
+ //, { field: 'hmainid', title: 'hmainid', width: 95 }
+ //, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
+ //, { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 182 }
+ //, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 105 }
+ //, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 105 }
+ //, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
]]
};
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- console.log(data1)
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationOutBillList;
table.render(option);
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
layer.msg("鎺ュ彛璇锋眰澶辫触!", {
@@ -201,19 +177,19 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationOutBillList;
table.render(option);
layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
index 90bea60..f0c432d 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
@@ -57,136 +57,140 @@
<tr>
<th>鏉″舰鐮�</th>
<td class="t1_input">
- <input type="text" name="鏉″舰鐮�" class="layui-input" id="sBillBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
</td>
</tr>
<tr>
<th>娴佽浆鍗″彿</th>
<td class="t1_input">
- <input type="text" name="娴佽浆鍗″彿" class="layui-input" id="娴佽浆鍗″彿" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>娴佹按鍙�</th>
<td class="t1_input">
- <input type="text" name="娴佹按鍙�" class="layui-input" id="sProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>宸ュ簭浠ｇ爜</th>
<td class="t1_input">
- <input type="text" name="宸ュ簭浠ｇ爜" class="layui-input" id="宸ュ簭浠ｇ爜" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProcID" class="layui-input" id="HProcID" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>宸ュ簭鍚嶇О</th>
<td class="t1_input">
- <input type="text" name="宸ュ簭鍚嶇О" class="layui-input" id="宸ュ簭鍚嶇О" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HProc" class="layui-input" id="HProc" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>鍒涘缓浜�</th>
<td class="t1_input">
- <input type="text" name="鍒涘缓浜�" class="layui-input" id="鍒涘缓浜�" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" id="HEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
<tr>
<th>鍚堟牸鏁伴噺</th>
<td class="t1_input">
- <input type="text" name="鍚堟牸鏁伴噺" class="layui-input" id="鍚堟牸鏁伴噺" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
+ <input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>宸ユ椂</th>
<td class="t1_input">
- <input type="text" name="宸ユ椂" class="layui-input" id="宸ユ椂" placeholder="璇疯緭鍏ュ伐鏃�">
+ <input type="text" name="HWorkTimes" class="layui-input" id="HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�">
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>鎶ュ簾鏁伴噺</th>
<td class="t1_input">
- <input type="text" name="鎶ュ簾鏁伴噺" class="layui-input" id="鎶ュ簾鏁伴噺" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
+ <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>鐢熶骇璧勬簮</th>
<td class="bz_td">
- <input type="text" name="鐢熶骇鐝粍" class="layui-input" id="ProductionResources" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="鐢熶骇璧勬簮浠ｇ爜" id="ProductionResourcesID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT">...</button>
</td>
</tr>
<tr>
<th>鐢熶骇鐝粍</th>
<td class="bz_td">
- <input type="text" name="鐢熶骇鐝粍" class="layui-input" id="ProductionTeam" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="鐢熶骇鐝粍浠ｇ爜" id="ProductionTeamID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
</td>
</tr>
<tr>
<th>宸ヤ綔涓績</th>
<td class="bz_td">
- <input type="text" name="宸ヤ綔涓績" class="layui-input" id="WorkCenter" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="宸ヤ綔涓績ID" id="WorkCenterID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HCenter" class="layui-input" id="HCenter" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT">...</button>
</td>
</tr>
- <tr>
+ <tr style="display:none;">
<th>妫�楠屽憳</th>
<td class="bz_td">
- <input type="text" name="妫�楠屽憳" class="layui-input" id="Employee" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="妫�楠屽憳ID" id="EmployeeID" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HQCCheck" class="layui-input" id="HQCCheck" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT">...</button>
</td>
</tr>
<tr>
<th>鍑虹珯鍗曞彿</th>
<td class="t1_input">
- <input type="text" name="鍑虹珯鍗曞彿" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ嚭绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="鍑虹珯鍗曞彿ID" class="layui-input" id="HInterID">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ嚭绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
</td>
</tr>
<tr>
<th>鏃ユ湡</th>
<td class="t1_input">
- <input type="date" name="鏃ユ湡" class="layui-input HDateNow" id="HDateNow" placeholder="璇烽�夋嫨鏃ユ湡">
+ <input type="date" name="HStationOutTime" class="layui-input" id="HStationOutTime" placeholder="璇烽�夋嫨鏃ユ湡">
</td>
</tr>
<tr>
<th>鐢熶骇璁㈠崟</th>
<td class="t1_input">
- <input type="text" name="鐢熶骇璁㈠崟" class="layui-input" id="鐢熶骇璁㈠崟" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浜у搧浠ｇ爜</th>
<td class="t1_input">
- <input type="text" name="浜у搧浠ｇ爜" class="layui-input" id="浜у搧浠ｇ爜" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterID" class="layui-input" id="HMaterID" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>浜у搧鍚嶇О</th>
<td class="t1_input">
- <input type="text" name="浜у搧鍚嶇О" class="layui-input" id="浜у搧鍚嶇О" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>瑙勬牸鍨嬪彿</th>
<td class="t1_input">
- <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="瑙勬牸鍨嬪彿" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>璁㈠崟璺熻釜鍙�</th>
<td class="t1_input">
- <input type="text" name="璁㈠崟璺熻釜鍙�" class="layui-input" id="璁㈠崟璺熻釜鍙�" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
<th>鐢熶骇璁㈠崟鏁伴噺</th>
<td class="t1_input">
- <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" id="鐢熶骇璁㈠崟鏁伴噺" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HICMOInterID" class="layui-input" id="HICMOInterID"><!--浠诲姟鍗曞彿ID鍙杊icmointerid-->
+ <input type="hidden" name="HDeptID" class="layui-input" id="HDeptID"><!--鐢熶骇杞﹂棿id-->
</td>
</tr>
</tbody>
@@ -229,15 +233,25 @@
, form = layui.form;
//鑾峰彇褰撳墠鏃堕棿澶勭悊
- $("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
- $("#鍒涘缓浜�").val(sessionStorage["HUserName"]);
+ $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+ $("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
+ $("#HProcID").val(sessionStorage["HProcName"]);
+ $("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+ $("#HSourceID").val(sessionStorage["HSourceID"]);
+ $("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ $("#HCenter").val(sessionStorage["HWorkCenter"]);//宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HProcNo").val(sessionStorage["HProcNo"]);//娴佹按鍙�
//椤甸潰鍒濆鍖栬祴鍊�
//鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
- //data: { "HBillType": '3790' },
+ data: { "HBillType": '3791' },
success: function (d) {
$("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
$("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
@@ -246,20 +260,16 @@
}
});
- $("#sBillBarCode").focus();
- $("#sBillBarCode").css("box-shadow", "0 0 0 1px #00ff00");
- $("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
- $("#Serial_number").css("background-color", "#efefef4d");
- $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
- $("#Entrants_number").css("background-color", "#efefef4d");
+ $("#HBarCode").focus();
+ $("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
//鎵潯褰㈢爜鏂规硶
- $('#sBillBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
- var sBillBarCode = $('#sBillBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ $('#HBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
- if (sBillBarCode == "") {
+ if (HBarCode == "") {
layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
@@ -268,30 +278,32 @@
url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
type: "GET",
data: {
- "sBillBarCode": sBillBarCode
+ "sBillBarCode": HBarCode
},
success: function (result) {
var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "娴佽浆鍗″彿": $("#sBillBarCode").val()
- , "宸ュ簭浠ｇ爜": data.宸ュ簭浠ｇ爜
- , "宸ュ簭鍚嶇О": data.宸ュ簭
- , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
- , "浜у搧浠ｇ爜": data.浜у搧浠ｇ爜
- , "浜у搧鍚嶇О": data.浜у搧
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
- , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+ "HProcExchBillNo": $("#HBarCode").val()
+ //, "HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ , "HICMOInterID": data.hicmointerid
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.璁″垝鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.浜у搧
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鐢熶骇鏁伴噺
+ , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
});
- //$("#sBillBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- //$("#sBillBarCode").css("background-color", "#efefef4d");
- $("#sBillBarCode").css("box-shadow", "none");
- $("#sProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
- $("#sProcNo").css("background-color", "white");
- $("#sProcNo").focus();
- $("#sProcNo").css("box-shadow", "0 0 0 1px #00ff00");
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
+ $("#HBarCode").css("box-shadow", "none");
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
@@ -301,11 +313,11 @@
});
//娴佹按鍙峰洖杞︽柟娉�
- $('#sProcNo').on('keydown', function (event) { //鎵潯褰㈢爜
- var sProcNo = $('#sProcNo').val();
- var sBillNo = $('#sBillBarCode').val();
+ $('#HProcNo').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HProcNo = $('#HProcNo').val();
+ var HBarCode = $('#HBarCode').val();
if (event.keyCode == 13) {
- if (sProcNo == "" || sBillNo == "") {
+ if (HProcNo == "" || HBarCode == "") {
layer.alert("娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
@@ -313,22 +325,28 @@
url: GetWEBURL() + "/api/newBill/getProcDetail",
type: "GET",
data: {
- "sBillNo": sBillNo
- , "sProcNo": sProcNo
+ "sBillNo": HBarCode
+ , "sProcNo": HProcNo
},
success: function (result) {
var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "宸ュ簭浠ｇ爜": data.宸ュ簭浠ｇ爜
- , "宸ュ簭鍚嶇О": data.宸ュ簭
- , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
- , "浜у搧浠ｇ爜": data.浜у搧浠ｇ爜
- , "浜у搧鍚嶇О": data.浜у搧
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
- , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+ //"HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ "HICMOInterID": data.hicmointerid
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.璁″垝鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.浜у搧
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鐢熶骇鏁伴噺
});
- $("#sProcNo").css("box-shadow", "none");
+ $("#HProcNo").css("box-shadow", "none");
checkPopup();
} else {
layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -340,15 +358,28 @@
}
});
+ //鍚堟牸鏁伴噺鍥炶溅鏂规硶
+ $('#HQty').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HQty").css("box-shadow", "none");
+ checkPopup();
+ }
+ });
+
//宸ユ椂鍥炶溅鏂规硶
- $('#宸ユ椂').on('keydown', function (event) {
- checkPopup();
+ $('#HWorkTimes').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HWorkTimes").css("box-shadow", "none");
+ checkPopup();
+ }
});
//鎶ュ簾鏁伴噺鍥炶溅鏂规硶
- $('#鎶ュ簾鏁伴噺').on('keydown', function (event) {
- $('#鎶ュ簾鏁伴噺').blur();
- checkPopup();
+ $('#HWasterQty').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HWasterQty").css("box-shadow", "none");
+ checkPopup();
+ }
});
//閫夋嫨鐢熶骇鐝粍寮圭獥
@@ -401,6 +432,7 @@
//閫夋嫨妫�楠屽憳
form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨妫�楠屽憳
+ var sMainStr = JSON.stringify(data.field);
layer.open({
type: 2
, area: ['100%', '100%']
@@ -419,16 +451,17 @@
//淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {//鎻愪氦
//debugger;
- var sMainStr = JSON.stringify(data.field);
- console.log(sMainStr);
+ var sMainStr = data.field;
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/test", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/api/newBill/setStationOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ //url:"http://localhost:12761/api/newBill/setStationOutBill",
async: true,
- data: { "oMain": sMainStr },
+ data: sMainStr,
dataType: "json",
success: function (result) {
+ console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#sHWHID").val("");
layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
@@ -450,16 +483,16 @@
//閫�鍑烘寜閽�
form.on('submit(Close)', function (data) {//閫�鍑�
layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs();
+ parent.location.href = "../../views/index.html";
});
});
//鏂板鎸夐挳
- //form.on('submit(HAddBT)', function (data) {//閫�鍑�
- // layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
- // window.location.reload();
- // });
- //});
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
@@ -474,33 +507,31 @@
});
- //鎻愮ず鏄惁閫夋嫨寮圭獥浜嬩欢鍙婃槸鍚﹁緭鍏ュ伐鏃跺拰鍚堟牸鏁伴噺
+ //鏍￠獙鏄惁閫夋嫨寮圭獥浜嬩欢
function checkPopup() {
- $("#宸ユ椂").css("box-shadow", "none");
- $("#鎶ュ簾鏁伴噺").css("box-shadow", "none");
- $("#ProductionResources").css("box-shadow", "none");
- $("#ProductionTeam").css("box-shadow", "none");
- $("#WorkCenter").css("box-shadow", "none");
- $("#Employee").css("box-shadow", "none");
- if (!$("#宸ユ椂").val()) {
- $("#宸ユ椂").focus();
- $("#宸ユ椂").css("box-shadow", "0 0 1px 2px #00ff00");
+ if (!$("#HQty").val()) {
+ $("#HQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HQty").focus();
}
- else if (!$("#鎶ュ簾鏁伴噺").val()) {
- $("#鎶ュ簾鏁伴噺").focus();
- $("#鎶ュ簾鏁伴噺").css("box-shadow", "0 0 1px 2px #00ff00");
+ //else if (!$("#HWorkTimes").val()) {//宸ユ椂
+ // $("#HWorkTimes").css("box-shadow", "0 0 0 1px #00ff00");
+ // $("#HWorkTimes").focus();
+ //}
+ //else if (!$("#HWasterQty").val()) {//鎶ュ簾鏁伴噺
+ // $("#HWasterQty").css("box-shadow", "0 0 0 1px #00ff00");
+ // $("#HWasterQty").focus();
+ //}
+ //else if (!$("#HSource").val()) {//鐢熶骇璧勬簮
+ // $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+ // $("#HSource").focus();
+ //}
+ else if (!$("#HGroup").val()) {
+ $("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
+ $("#HGroup").focus();
}
- else if (!$("#ProductionResources").val()) {
- $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
- }
- else if (!$("#ProductionTeam").val()) {
- $("#ProductionTeam").css("box-shadow", "0 0 1px 2px #00ff00");
- }
- else if (!$("#WorkCenter").val()) {
- $("#WorkCenter").css("box-shadow", "0 0 1px 2px #00ff00");
- }
- else if (!$("#Employee").val()) {
- $("#Employee").css("box-shadow", "0 0 1px 2px #00ff00");
+ else if (!$("#HCenter").val()) {
+ $("#HCenter").css("box-shadow", "0 0 1px 2px #00ff00");
+ $("#HCenter").focus();
}
}
@@ -509,9 +540,9 @@
if (obj.length == 0) {
layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
} else {
- $("#ProductionTeam").val(obj[0].鐝粍);
- $("#ProductionTeamID").val(obj[0].HItemID);
- $("#ProductionTeam").css("box-shadow", "none");
+ $("#HGroup").val(obj[0].鐝粍);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HGroup").css("box-shadow", "none");
checkPopup();
layer.closeAll();
}
@@ -519,12 +550,12 @@
//杩斿洖鐢熶骇璧勬簮
function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
- if ($("#ProductionResources").val()) {
- $("#ProductionResources").css("box-shadow", "none");
+ if ($("#HSource").val()) {
+ $("#HSource").css("box-shadow", "none");
}
- $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
- $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠ｇ爜);
- $("#ProductionResources").css("box-shadow", "none");
+ $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ $("#HSource").css("box-shadow", "none");
checkPopup();
}
@@ -533,9 +564,9 @@
if (obj.length == 0) {
layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
} else {
- $("#WorkCenter").val(obj[0].鐢熶骇鐝粍);
- $("#WorkCenterID").val(obj[0].HItemID);
- $("#WorkCenter").css("box-shadow", "none");
+ $("#HCenter").val(obj[0].宸ヤ綔涓績);
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenter").css("box-shadow", "none");
checkPopup();
layer.closeAll();
}
@@ -543,12 +574,11 @@
//杩斿洖妫�楠屽憳
function GetHSecManagerValue(obj) { //杩斿洖妫�楠屽憳
- $("#Employee").val(obj[0].HName);
- $("#EmployeeID").val(obj[0].HNumber);
- $("#Employee").css("box-shadow", "none");
- checkPopup();
+ $("#HQCCheck").val(obj[0].HName);
+ $("#HQCCheckID").val(obj[0].HItemID);
}
+
</script>
</body>
</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
new file mode 100644
index 0000000..7b5486f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -0,0 +1,259 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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="date" class="layui-input" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ </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="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </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', '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'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
+ { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
+ //, { field: 'HDeptID', title: 'HDeptID' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
+ //, { field: 'HMaterID', title: 'HMaterID' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+ //, { field: 'hunitid', title: 'hunitid' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ //, { field: 'hempid', title: 'hempid' }
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
+ , { field: 'hcusid', title: 'hcusid' }
+ , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜' }
+ , { field: '瀹㈡埛', title: '瀹㈡埛' }
+ //, { field: 'HCenterID', title: 'HCenterID' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ //, { field: 'hbomid', title: 'hbomid' }
+ , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�' }
+ //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜' }
+ , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ //, { field: 'hsubid', title: 'hsubid' }
+ , { 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: '璁″垝璺熻釜鍙�' }
+ ]]
+ };
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ var index0 = layer.load(0, { shade: false });
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index0);
+ } else {
+ layer.close(index0);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HDate").val("");//寮�濮嬫棩鏈�
+ $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ if (HDate) {
+ sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ }
+ if (HOrderProcNO) {
+ sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ var index = layer.load(0, { shade: false });
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ 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缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
new file mode 100644
index 0000000..7643d6e
--- /dev/null
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -0,0 +1,232 @@
+锘�<!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">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title 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="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ </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>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </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', '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'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,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: '娴佽浆宸ュ簭' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").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 + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1