From 3e7ed40694050102fffa5b285a061e99ff025dfc Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 19 一月 2021 15:11:12 +0800
Subject: [PATCH] nothing

---
 WebTM/views/Baseset/基础资料/Gy_GetProductionResourcesList.html |  101 ++++
 WebTM/Properties/PublishProfiles/webtm.pubxml.user          |   18 
 WebTM/views/Baseset/基础资料/Gy_WorkCenterList.html             |  100 ++++
 WebTM/views/工序汇报/MES_StationInBill_PDA.html                 |  226 +++++---
 WebTM/views/工序汇报/MES_StationOutBill_PDA.html                | 1017 +++++++++++++++------------------------
 WebTM/WebTM.csproj                                          |    2 
 6 files changed, 746 insertions(+), 718 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index fcde455..802a4b1 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/17/2021 21:24:39</publishTime>
+      <publishTime>01/18/2021 10:04:21</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>01/17/2021 21:24:39</publishTime>
+      <publishTime>01/18/2021 10:04:21</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/17/2021 21:24:22</publishTime>
+      <publishTime>01/19/2021 14:13:36</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>01/14/2021 10:06:24</publishTime>
@@ -726,6 +726,9 @@
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html">
       <publishTime>01/14/2021 10:06:24</publishTime>
     </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html">
+      <publishTime>01/18/2021 09:49:20</publishTime>
+    </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html">
       <publishTime>01/14/2021 20:55:55</publishTime>
     </File>
@@ -737,6 +740,9 @@
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html">
       <publishTime>01/14/2021 10:06:24</publishTime>
+    </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html">
+      <publishTime>01/19/2021 14:12:23</publishTime>
     </File>
     <File Include="views/component/anim/index.html">
       <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1081,7 +1087,7 @@
       <publishTime>01/14/2021 15:07:03</publishTime>
     </File>
     <File Include="views/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">
-      <publishTime>01/17/2021 23:20:25</publishTime>
+      <publishTime>01/19/2021 15:03:45</publishTime>
     </File>
     <File Include="views/宸ュ簭姹囨姤/MES_StationOutBill.html">
       <publishTime>01/14/2021 15:28:59</publishTime>
@@ -1090,7 +1096,7 @@
       <publishTime>01/14/2021 15:07:10</publishTime>
     </File>
     <File Include="views/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">
-      <publishTime>01/14/2021 17:17:09</publishTime>
+      <publishTime>01/18/2021 14:39:27</publishTime>
     </File>
     <File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
       <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1204,7 +1210,7 @@
       <publishTime>05/08/2020 23:33:42</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>01/14/2021 23:06:12</publishTime>
+      <publishTime>01/18/2021 08:57:06</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6c7e0ab..cf3f9ee 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -299,6 +299,8 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EmployeeList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionResourcesList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WorkCenterList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionTeamList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionResourcesList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionResourcesList.html"
new file mode 100644
index 0000000..fdfa211
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProductionResourcesList.html"
@@ -0,0 +1,101 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="ck-table"></table>
+    <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>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                var checkStatus = table.checkStatus('ck-table')
+                 , data = checkStatus.data;
+                parent.GetProductionResourcesValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#ck-table'
+                // , url: '/demo/table/user/'
+               , data: []
+              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                , { field: 'HItemID', width: 150, title: '鐢熶骇璧勬簮ID', hide: true }
+                , { field: '鐢熶骇璧勬簮浠g爜', width: 150, title: '鐢熶骇璧勬簮浠g爜' }
+                , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var Value = " and HNumber like '%" + Where + "%' or HName like '%" + Where + "%'";
+                if (!Where) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/api/newBill/getSourceList",
+                    async: true,
+                    data: { "sWhere": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data.Gy_Source;
+                        table.reload('ck-table', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
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"
new file mode 100644
index 0000000..35c17cf
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
@@ -0,0 +1,100 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="ck-table"></table>
+    <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>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+            //蹇�熸煡璇�
+            form.on('submit(HQuery)', function () {
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                RoadQuery($('#Value').val());
+            });
+            //杩斿洖
+            form.on('submit(FH)', function () {//閫夋嫨
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                var checkStatus = table.checkStatus('ck-table')
+                 , data = checkStatus.data;
+                parent.GetWorkCenterValue(data);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#ck-table'
+                // , url: '/demo/table/user/'
+               , data: []
+              //, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                  , { field: 'HItemID', title: 'HItemID', hide: true }
+                  , { field: '鐢熶骇鐝粍浠g爜', width: 110, title: '鐢熶骇鐝粍浠g爜' }
+                  , { field: '鐢熶骇鐝粍', width: 110, title: '鐢熶骇鐝粍', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var Value = " and HNumber like '%" + Where + "%' or HName like '%" + Where + "%'";
+                if (!Where) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/api/newBill/getWorkCenterList",
+                    async: true,
+                    data: { "sWhere": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data.Gy_Source;
+                        table.reload('ck-table', {
+                            data: ajaxReturnData
+                            //, height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
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 41174f0..2b55ef2 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"
@@ -57,66 +57,67 @@
                                 <tr>
                                     <th>鏉″舰鐮�</th>
                                     <td class="t1_input">
-                                        <input type="text" name="sBillBarCode" 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="sProcNo" 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>宸ュ簭浠g爜</th>
                                     <td class="t1_input">
-                                        <input type="text" name="宸ュ簭浠g爜" class="layui-input" id="宸ュ簭浠g爜" 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="璇疯緭鍏ヨ繘绔欐暟閲�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ヨ繘绔欐暟閲�">
                                     </td>
                                 </tr>
                                 <tr>
                                     <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="鐢熶骇璧勬簮浠g爜" 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="鐢熶骇鐝粍浠g爜" 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="HProcName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="宸ヤ綔涓績浠g爜" id="HProcID" 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>
@@ -130,43 +131,46 @@
                                 <tr>
                                     <th>鏃ユ湡</th>
                                     <td class="t1_input">
-                                        <input type="date" name="鏃ユ湡" class="layui-input HDateNow" id="HDateNow" placeholder="璇烽�夋嫨鏃ユ湡">
+                                        <input type="date" name="HStationInTime" class="layui-input" id="HStationInTime" 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>浜у搧浠g爜</th>
                                     <td class="t1_input">
-                                        <input type="text" name="浜у搧浠g爜" class="layui-input" id="浜у搧浠g爜" 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>
@@ -209,8 +213,9 @@
                 , form = layui.form;
 
             //鑾峰彇褰撳墠鏃堕棿澶勭悊
-            $("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
-            $("#鍒涘缓浜�").val(sessionStorage["HUserName"]);
+            $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HEmp").val(sessionStorage["HUserName"]);
+            $("#HEmpID").val(sessionStorage["Czybm"]);
 
             //椤甸潰鍒濆鍖栬祴鍊�
             //鑾峰彇鍗曟嵁鍙�
@@ -226,8 +231,8 @@
                 }
             });
 
-            $("#sBillBarCode").focus();
-            $("#sBillBarCode").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");
             $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
@@ -235,11 +240,11 @@
 
 
             //鎵潯褰㈢爜鏂规硶
-            $('#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;
                     }
@@ -248,27 +253,34 @@
                         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()
-                                    , "宸ュ簭浠g爜": data.宸ュ簭浠g爜
-                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
-                                    , "浜у搧浠g爜": data.浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data.浜у搧
-                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+                                    "HProcExchBillNo": $("#HBarCode").val()
+                                    , "HProcID": data.HProcID
+                                    , "HProc": data.宸ュ簭
+                                    , "HCenter": data.宸ヤ綔涓績
+                                    , "HCenterID": data.宸ヤ綔涓績浠g爜
+                                    , "HICMOInterID": data.hicmointerid
+                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                    , "HDeptID": data.HDeptID
+                                    , "HQty": data.璁″垝鏁伴噺
+                                    , "HMaterID": data.浜у搧浠g爜
+                                    , "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");
+                                $("#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' });
                             }
@@ -280,11 +292,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;
                     }
@@ -292,22 +304,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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "宸ュ簭浠g爜": data.宸ュ簭浠g爜
-                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
-                                    , "浜у搧浠g爜": data.浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data.浜у搧
-                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+                                     "HProcID": data.HProcID
+                                    , "HProc": data.宸ュ簭
+                                    , "HCenter": data.宸ヤ綔涓績
+                                    , "HCenterID": data.宸ヤ綔涓績浠g爜
+                                    , "HICMOInterID": data.hicmointerid
+                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                    , "HDeptID": data.HDeptID
+                                    , "HQty": data.璁″垝鏁伴噺
+                                    , "HMaterID": data.浜у搧浠g爜
+                                    , "HMaterName": data.浜у搧
+                                    , "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    , "HICMOQty": data.鐢熶骇鏁伴噺
                                 });
-                                $("#sProcNo").css("box-shadow", "none");
-                                $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
+                                $("#HProcNo").css("box-shadow", "none");
+                                checkPopup();
                             } else {
                                 layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             }
@@ -331,7 +349,7 @@
                     }
                 }
             });
-
+            
             //閫夋嫨鐢熶骇鐝粍寮圭獥
             form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
                 layer.open({
@@ -364,33 +382,51 @@
                 })
             });
 
+            //閫夋嫨宸ヤ綔涓績寮圭獥
+            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(Saver)', function (data) {//鎻愪氦
                 //debugger;
-                var sMainStr = JSON.stringify(data.field);
+                var sMainStr =data.field;
                 console.log(sMainStr);
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "/LEMS/Sub_SaveBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        //url: GetWEBURL() + "/api/newBill/setStationInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: "http://localhost:12761/api/newBill/setStationInBill",
                         async: true,
-                        data: { "oMain": sMainStr },
+                        data: sMainStr,
                         dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        success: function (result) {
+                            console.log(result);
+                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 $("#sHWHID").val("");
-                                layer.alert(data.Message + $("#HBillNo").val(), { icon: 1 }, function () {
+                                layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
                                     window.location.reload();//鍒锋柊椤甸潰
                                 });
                             }
                             else {
-                                layer.alert(data.Message, { icon: 5 });
+                                layer.alert(result.msg, { icon: 5 });
                             }
                             layer.closeAll("loading");
                             layui.form.render();
                         },
                         error: function (err) {
-                            layer.alert("閿欒:" + err, { icon: 5 });
+                            layer.alert("鎺ュ彛璇锋眰澶辫触:" + err, { icon: 5 });
                         }
                     });
             });
@@ -422,42 +458,54 @@
 
         });
 
+        //鏍¢獙鏄惁閫夋嫨寮圭獥浜嬩欢
+        function checkPopup() {
+            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()) {
+                $("#HCenter").css("box-shadow", "0 0 1px 2px #00ff00");
+            } 
+        }
+
+        //杩斿洖鐢熶骇鐝粍
         function GetProductionTeamValue(obj) {  //杩斿洖鐢熶骇鐝粍
             if (obj.length == 0) {
                 layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
             } else {
-                $("#ProductionTeam").val(obj[0].鐝粍);
-                $("#ProductionTeamID").val(obj[0].HItemID);
-                $("#ProductionTeam").css("box-shadow", "none");
-                if ($("#ProductionResources").val()) {
-                    $("#ProductionResources").css("box-shadow", "none");
-                } else {
-                    $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
-                }
+                $("#HGroup").val(obj[0].鐝粍);
+                $("#HGroupID").val(obj[0].HItemID);
+                $("#HGroup").css("box-shadow", "none");
+                checkPopup();
                 layer.closeAll();
             }
         }
 
         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].鐢熶骇璧勬簮浠g爜);
-            $("#ProductionResources").css("box-shadow", "none");
+            $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+            $("#HSourceID").val(obj[0].HItemID);
+            $("#HSource").css("box-shadow", "none");
+            checkPopup();
         }
 
-
-                            //function GetHEmpValue(obj)  //杩斿洖鑱屽憳
-                            //{
-                            //    $("#HEmpName").val(obj[0].HName);
-                            //    $("#HEmpID").val(obj[0].HItemID);
-                            //}
-                            //function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
-                            //{
-                            //    $("#HDeptName").val(obj[0].HName);
-                            //    $("#HDeptID").val(obj[0].HItemID);
-                            //}
+        //杩斿洖宸ヤ綔涓績
+        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();
+            }
+        }
 
 
     </script>
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 9af730b..90bea60 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"
@@ -8,451 +8,197 @@
     <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">浜у搧浠g爜</th>
-                                                    <td>
-                                                        <input type="text" name="浜у搧浠g爜" id="HBillNo" lay-verify="HBillNo" autocomplete="off" placeholder="浜у搧浠g爜" 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="褰撳墠宸ュ簭浠g爜" 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="宸ヤ綔涓績浠g爜" 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="鐢熶骇杞﹂棿浠g爜" 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="鐢熶骇缁勭粐浠g爜" 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="鐢熶骇鐝粍浠g爜" 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="鐢熶骇璧勬簮浠g爜" 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="鏍哥畻宸ュ簭浠g爜" 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="妫�楠屽憳浠g爜" 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="鏉″舰鐮�" class="layui-input" id="sBillBarCode" 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>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>娴佹按鍙�</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="娴佹按鍙�" class="layui-input" id="sProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>宸ュ簭浠g爜</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="宸ュ簭浠g爜" class="layui-input" id="宸ュ簭浠g爜" 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>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鍒涘缓浜�</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="鍒涘缓浜�" class="layui-input" id="鍒涘缓浜�" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鍚堟牸鏁伴噺</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="鍚堟牸鏁伴噺" class="layui-input" id="鍚堟牸鏁伴噺" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>宸ユ椂</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="宸ユ椂" class="layui-input" id="宸ユ椂" placeholder="璇疯緭鍏ュ伐鏃�">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鎶ュ簾鏁伴噺</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="鎶ュ簾鏁伴噺" class="layui-input" id="鎶ュ簾鏁伴噺" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <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="鐢熶骇璧勬簮浠g爜" id="ProductionResourcesID" 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="鐢熶骇鐝粍浠g爜" id="ProductionTeamID" 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">
+                                        <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="妫�楠屽憳" 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">
+                                        <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">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鏃ユ湡</th>
+                                    <td class="t1_input">
+                                        <input type="date" name="鏃ユ湡" class="layui-input HDateNow" id="HDateNow" placeholder="璇烽�夋嫨鏃ユ湡">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鐢熶骇璁㈠崟</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="鐢熶骇璁㈠崟" class="layui-input" id="鐢熶骇璁㈠崟" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>浜у搧浠g爜</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="浜у搧浠g爜" class="layui-input" id="浜у搧浠g爜" 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>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>瑙勬牸鍨嬪彿</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="瑙勬牸鍨嬪彿" 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>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鐢熶骇璁㈠崟鏁伴噺</th>
+                                    <td class="t1_input">
+                                        <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" id="鐢熶骇璁㈠崟鏁伴噺" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+                                    </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 +221,116 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).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;
+            $("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#鍒涘缓浜�").val(sessionStorage["HUserName"]);
 
             //椤甸潰鍒濆鍖栬祴鍊�
             //鑾峰彇鍗曟嵁鍙�
             $.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");
+            $("#sBillBarCode").focus();
+            $("#sBillBarCode").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();
+            $('#sBillBarCode').on('keydown', function (event) {   //鎵潯褰㈢爜
+                var sBillBarCode = $('#sBillBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
                 if (event.keyCode == 13) {
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    if (HFbarcode == "") {
+                    if (sBillBarCode == "") {
                         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": sBillBarCode
                         },
                         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].璁㈠崟璺熻釜鍙�
-                                    , "浜у搧浠g爜": data[0].浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data[0].浜у搧
-                                    , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
-                                    , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
-                                    , "鍒跺崟浜�": data[0].鍒跺崟浜�
-                                    , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
-                                    , "淇敼浜�": data[0].淇敼浜�
-                                    , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
-                                    , "瀹℃牳浜�": data[0].瀹℃牳浜�
-                                    , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
-                                    , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
-                                    , "娴佽浆鍗″彿": $("#HFbarcode").val()
+                                    "娴佽浆鍗″彿": $("#sBillBarCode").val()
+                                    , "宸ュ簭浠g爜": data.宸ュ簭浠g爜
+                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
+                                    , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
+                                    , "浜у搧浠g爜": data.浜у搧浠g爜
+                                    , "浜у搧鍚嶇О": data.浜у搧
+                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
+                                    , "鐢熶骇璁㈠崟鏁伴噺": 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");
+                                //$("#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");
                             } else {
-                                // $("#verifycode").click();
-                                //layer.msg(result.Message, { icon: 5 });
                                 layer.alert(result.Message, { 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();
+            $('#sProcNo').on('keydown', function (event) {   //鎵潯褰㈢爜
+                var sProcNo = $('#sProcNo').val();
+                var sBillNo = $('#sBillBarCode').val();
                 if (event.keyCode == 13) {
                     if (sProcNo == "" || sBillNo == "") {
                         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": sBillNo
+                            , "sProcNo": sProcNo
                         },
                         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].璁㈠崟璺熻釜鍙�
-                                    , "浜у搧浠g爜": data[0].浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data[0].浜у搧
-                                    , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
-                                    , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
-                                    , "宸ヤ綔涓績": data[0].宸ヤ綔涓績
-                                    , "宸ヤ綔涓績浠g爜": data[0].宸ヤ綔涓績浠g爜
-                                    , "褰撳墠宸ュ簭": data[0].宸ュ簭
-                                    , "褰撳墠宸ュ簭浠g爜": data[0].宸ュ簭浠g爜
-                                    , "鐢熶骇杞﹂棿": data[0].鐢熶骇杞﹂棿
-                                    , "鐢熶骇杞﹂棿浠g爜": data[0].鐢熶骇杞﹂棿浠g爜
-                                    , "鎿嶄綔鍛�": data[0].鎿嶄綔宸�
-                                    , "鎿嶄綔鍛樹唬鐮�": data[0].鎿嶄綔宸ヤ唬鐮�
-                                    , "鐢熶骇鐝粍": data[0].鐝粍
-                                    , "鐢熶骇鐝粍浠g爜": data[0].鐝粍浠g爜
-                                    , "鐢熶骇璧勬簮": data[0].鐢熶骇璧勬簮
-                                    , "鐢熶骇璧勬簮浠g爜": data[0].鐢熶骇璧勬簮浠g爜
-                                    , "鍒跺崟浜�": data[0].鍒跺崟浜�
-                                    , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
-                                    , "淇敼浜�": data[0].淇敼浜�
-                                    , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
-                                    , "瀹℃牳浜�": data[0].瀹℃牳浜�
-                                    , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
-                                    , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
-                                    , "娴佽浆鍗″彿": $("#HFbarcode").val()
+                                    "宸ュ簭浠g爜": data.宸ュ簭浠g爜
+                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
+                                    , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
+                                    , "浜у搧浠g爜": data.浜у搧浠g爜
+                                    , "浜у搧鍚嶇О": data.浜у搧
+                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
+                                    , "鐢熶骇璁㈠崟鏁伴噺": 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");
+                                $("#sProcNo").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 () {
@@ -636,42 +340,75 @@
                 }
             });
 
-            //鍚堟牸鏁伴噺鍥炶溅鏂规硶
-            $('#QualifiedQuantity').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");
-                }
+            //宸ユ椂鍥炶溅鏂规硶
+            $('#宸ユ椂').on('keydown', function (event) {
+                checkPopup();
             });
 
             //鎶ュ簾鏁伴噺鍥炶溅鏂规硶
-            $('#ScrapQuantity').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");
-                    }
-                }
+            $('#鎶ュ簾鏁伴噺').on('keydown', function (event) {
+                $('#鎶ュ簾鏁伴噺').blur();
+                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) {//閫夋嫨妫�楠屽憳
+                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,21 +416,35 @@
                 })
             });
 
-            //閫夋嫨鐢熶骇缁勭粐寮圭獥
-            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 = JSON.stringify(data.field);
+                console.log(sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/test", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "oMain": sMainStr },
+                        dataType: "json",
+                        success: function (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 });
+                        }
+                    });
             });
 
             //閫�鍑烘寜閽�
@@ -703,80 +454,100 @@
                 });
             });
 
-            //寰呮帴鏀跺伐鍗曢〉绛�
-            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");
-                }
-            });
-
-            //浠婃棩杩涚珯椤电
-            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");
-                }
-            });
-            
+            //鏂板鎸夐挳
+            //form.on('submit(HAddBT)', function (data) {//閫�鍑�
+            //    layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+            //        window.location.reload();
+            //    });
+            //});
 
 
 
 
 
 
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //鍘熺敓js鍒濆鍖�
+        $(function () {
 
         });
 
-        
-
-        function GetOrgValue(obj)  //杩斿洖鐢熶骇缁勭粐
-        {
-            $("#HOrganization").val(obj[0].HName);
-            $("#HOrganizationID").val(obj[0].HNumber);
+        //鎻愮ず鏄惁閫夋嫨寮圭獥浜嬩欢鍙婃槸鍚﹁緭鍏ュ伐鏃跺拰鍚堟牸鏁伴噺
+        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");
+            }
+            else if (!$("#鎶ュ簾鏁伴噺").val()) {
+                $("#鎶ュ簾鏁伴噺").focus();
+                $("#鎶ュ簾鏁伴噺").css("box-shadow", "0 0 1px 2px #00ff00");
+            }
+            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");
+            }
         }
 
-        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 {
+                $("#ProductionTeam").val(obj[0].鐝粍);
+                $("#ProductionTeamID").val(obj[0].HItemID);
+                $("#ProductionTeam").css("box-shadow", "none");
+                checkPopup();
+                layer.closeAll();
+            }
         }
-        //function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
-        //{
-        //    $("#HDeptName").val(obj[0].HName);
-        //    $("#HDeptID").val(obj[0].HItemID);
-        //}
 
+        //杩斿洖鐢熶骇璧勬簮
+        function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
+            if ($("#ProductionResources").val()) {
+                $("#ProductionResources").css("box-shadow", "none");
+            }
+            $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
+            $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠g爜);
+            $("#ProductionResources").css("box-shadow", "none");
+            checkPopup();
+        }
+
+        //杩斿洖宸ヤ綔涓績
+        function GetWorkCenterValue(obj) {  //杩斿洖宸ヤ綔涓績
+            if (obj.length == 0) {
+                layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+            } else {
+                $("#WorkCenter").val(obj[0].鐢熶骇鐝粍);
+                $("#WorkCenterID").val(obj[0].HItemID);
+                $("#WorkCenter").css("box-shadow", "none");
+                checkPopup();
+                layer.closeAll();
+            }
+        }
+
+        //杩斿洖妫�楠屽憳
+        function GetHSecManagerValue(obj) {  //杩斿洖妫�楠屽憳
+            $("#Employee").val(obj[0].HName);
+            $("#EmployeeID").val(obj[0].HNumber);
+            $("#Employee").css("box-shadow", "none");
+            checkPopup();
+        }
 
     </script>
 </body>

--
Gitblit v1.9.1