From 2fbf57eedfc54ef02da32bdd67ad0cbedb6364cc Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 07 三月 2023 14:46:08 +0800
Subject: [PATCH] 主控台屏蔽一些内容,工序进出站、设备 PDA版更改排版样式

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html     |  628 ++++++
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html      |  934 +++++++--
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |   35 
 WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html    |  410 ++--
 WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html     |  324 +-
 WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html     |  390 ++--
 WebTM/views/home/console.html                          |   32 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html     | 1147 ++++++++++++
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html         |  207 +
 WebTM/layuiadmin/modules/console.js                    |    4 
 WebTM/views/设备管理/Sb_EquipMaintainBillList_Mul.html     |  319 +-
 WebTM/views/index.html                                 |   24 
 WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html       |  921 +++++----
 WebTM/WebTM.csproj                                     |    2 
 WebTM/views/基础资料/基础资料/Gy_TaxMIXEdit.html               |   25 
 15 files changed, 3,988 insertions(+), 1,414 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index aa62024..4838518 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -174,6 +174,8 @@
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkEdit.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WindowPrint.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
diff --git a/WebTM/layuiadmin/modules/console.js b/WebTM/layuiadmin/modules/console.js
index 4f9bb49..72762a9 100644
--- a/WebTM/layuiadmin/modules/console.js
+++ b/WebTM/layuiadmin/modules/console.js
@@ -49,10 +49,10 @@
     ,echarts = layui.echarts;
     
     var echartsApp = [], options = [
-      //浠婃棩娴侀噺瓒嬪娍
+      //浠婃棩浜ч噺瓒嬪娍
       {
         title: {
-          text: '浠婃棩娴侀噺瓒嬪娍',
+          text: '浠婃棩浜ч噺瓒嬪娍',
           x: 'center',
           textStyle: {
             fontSize: 14
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 862531f..bc0878c 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -27,7 +27,7 @@
                                         <ul class="layui-row layui-col-space10 layui-this">
                                             <li class="layui-col-xs3">
                                                 <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
-                                                    <i class="layui-icon layui-icon-console"></i>
+                                                    <i class="layui-icon layui-icon-chrome"></i>
                                                     <cite>澶栬喘鍏ュ簱</cite>
                                                 </a>
                                             </li>
@@ -246,7 +246,7 @@
                                                 <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
                                             </div>
                                         </div>
-                                        <div class="layui-this" _echarts_instance_="1621151534574" style="-webkit-tap-highlight-color: transparent; user-select: none; cursor: default; background-color: rgba(0, 0, 0, 0);">
+                                        <!--<div class="layui-this" _echarts_instance_="1621151534574" style="-webkit-tap-highlight-color: transparent; user-select: none; cursor: default; background-color: rgba(0, 0, 0, 0);">
                                             <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
                                                 <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
                                                 <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
@@ -261,9 +261,9 @@
                                                 <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
                                                 <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
-                                    <div class="layui-carousel-ind"><ul><li class=""></li><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+                                    <div class="layui-carousel-ind"><ul><li class=""></li><!--<li class="layui-this"></li><li class=""></li>--></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
                                 </div>
                             </div>
                         </div>
@@ -298,28 +298,28 @@
                                     <li class="layui-col-xs6">
                                         <a href="javascript:void(0);">
                                             <!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
-                                            <h3>寰呭璇勮</h3>
+                                            <h3>寰呭鍗曟嵁</h3>
                                             <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
                                         <a href="javascript:void(0);">
                                             <!--<a lay-href="app/forum/list.html" class="layadmin-backlog-body">-->
-                                            <h3>寰呭甯栧瓙</h3>
+                                            <h3>寰呭璧勬枡</h3>
                                             <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
                                         <a href="javascript:void(0);">
                                             <!--<a lay-href="template/goodslist.html" class="layadmin-backlog-body">-->
-                                            <h3>寰呭鍟嗗搧</h3>
+                                            <h3>寰呮煡鐪嬫秷鎭�</h3>
                                             <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
                                         <a href="javascript:void(0);">
                                             <!--<a href="javascript:;" onclick="layer.tips('涓嶈烦杞�', this, {tips: 3});" class="layadmin-backlog-body">-->
-                                            <h3>寰呭彂璐�</h3>
+                                            <h3>寰呭洖澶嶆秷鎭�</h3>
                                             <p><cite>0</cite></p>
                                         </a>
                                     </li>
@@ -341,12 +341,12 @@
                     <div class="layui-card-header">鏁堟灉鎶ュ憡</div>
                     <div class="layui-card-body layadmin-takerates">
                         <div class="layui-progress" lay-showPercent="yes">
-                            <h3>杞寲鐜囷紙鏃ュ悓姣� 28% <span class="layui-edge layui-edge-top" lay-tips="澧為暱" lay-offset="-15"></span>锛�</h3>
-                            <div class="layui-progress-bar" lay-percent="65%"></div>
+                            <h3>瀹屽伐鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-top" lay-tips="澧為暱" lay-offset="-15"></span>锛�</h3>
+                            <div class="layui-progress-bar" lay-percent="0%"></div>
                         </div>
                         <div class="layui-progress" lay-showPercent="yes">
-                            <h3>绛惧埌鐜囷紙鏃ュ悓姣� 11% <span class="layui-edge layui-edge-bottom" lay-tips="涓嬮檷" lay-offset="-15"></span>锛�</h3>
-                            <div class="layui-progress-bar" lay-percent="32%"></div>
+                            <h3>涓嶈壇鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-bottom" lay-tips="涓嬮檷" lay-offset="-15"></span>锛�</h3>
+                            <div class="layui-progress-bar" lay-percent="0%"></div>
                         </div>
                     </div>
                 </div>
@@ -354,12 +354,12 @@
                     <div class="layui-card-header">瀹炴椂鐩戞帶</div>
                     <div class="layui-card-body layadmin-takerates">
                         <div class="layui-progress" lay-showPercent="yes">
-                            <h3>CPU浣跨敤鐜�</h3>
-                            <div class="layui-progress-bar" lay-percent="58%"></div>
+                            <h3>璁惧绋煎姩鐜�</h3>
+                            <div class="layui-progress-bar" lay-percent="0%"></div>
                         </div>
                         <div class="layui-progress" lay-showPercent="yes">
-                            <h3>鍐呭瓨鍗犵敤鐜�</h3>
-                            <div class="layui-progress-bar layui-bg-red" lay-percent="90%"></div>
+                            <h3>璁惧鏁呴殰鐜�</h3>
+                            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
                         </div>
                     </div>
                 </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index bc789c8..ccfe99e 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -30,20 +30,20 @@
                             <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="http://www.layui.com/admin/" target="_blank" title="鍓嶅彴">
                             <i class="layui-icon layui-icon-website"></i>
                         </a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item" lay-unselect>
                         <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
                             <i class="layui-icon layui-icon-refresh-3"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
-                    </li>
-                    <li class="layui-nav-item" lay-unselect style="color: black;">
+                    </li>-->
+                    <li class="layui-nav-item" lay-unselect style="color: black;margin-left:290px">
                         <span>鐧诲綍缁勭粐锛�</span>
                         <label id="Organization"></label>
                     </li>
@@ -59,11 +59,11 @@
                             <span class="layui-badge-dot"></span>
                         </a>
                     </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="theme">
                             <i class="layui-icon layui-icon-theme"></i>
                         </a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="note">
                             <i class="layui-icon layui-icon-note"></i>
@@ -74,22 +74,22 @@
                             <i class="layui-icon layui-icon-screen-full"></i>
                         </a>
                     </li>
-                    <li class="layui-nav-item" lay-unselect>
+                    <li class="layui-nav-item" lay-unselect style="margin-right:12px;">
                         <a href="javascript:;">
                             <cite>
                                 <label name="UserName" id="UserName"></label>
                             </cite>
                         </a>
                         <dl class="layui-nav-child">
-                            <dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
+                            <!--<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>-->
                             <dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
                             <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
                         </dl>
                     </li>
 
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
-                    </li>
+                    </li>-->
                     <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                         <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
                     </li>
@@ -449,6 +449,8 @@
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>
                                         <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
                                         <dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXEdit.html"
index 7bd0cde..e0413b5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXEdit.html"
@@ -145,6 +145,9 @@
         var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
         var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
 
+        // 鍒濆鍖栫晫
+        set_InitGrid();
+
         //鍒ゆ柇鏄惁鏂板
         if (linterid == null || linterid == 0) {
 
@@ -163,8 +166,7 @@
             "HTAXBENCHMARK": "", "FTAXRATEID": 0,"绋庣巼浠g爜": "","绋庣巼鍚嶇О": "","FTAXBENCHMARKCORRVALUE ": 0
         }];
 
-        // 鍒濆鍖栫晫
-        set_InitGrid();
+      
 
         //澶村伐鍏锋爮浜嬩欢
         table.on('toolbar(mainTable)', function (obj) {
@@ -294,7 +296,9 @@
                 ]]
             }
 
-            option.data = rowdata;
+            option.data = [{
+                "HTAXBENCHMARK": "", "FTAXRATEID": 0, "绋庣巼浠g爜": "", "绋庣巼鍚嶇О": "", "FTAXBENCHMARKCORRVALUE ": 0
+            }];
             table.render(option);
         }
 
@@ -355,13 +359,24 @@
                     //涓昏〃
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                         "HItemID": d.data[0].HItemID
-                        , "HNumber": d.data[0].绋庣粍鍚堜唬鐮�
-                        , "HName": d.data[0].绋庣粍鍚堝悕绉�
+                        , "HNumber": d.data[0].浠g爜
+                        , "HName": d.data[0].鍚嶇О
                         , "HCREATEORGID": d.data[0].HCREATEORGID
                         , "HUSEORGID": d.data[0].HUSEORGID
                         , "HStopflag": d.data[0].绂佺敤鏍囪
                         , "HRemark": d.data[0].澶囨敞                      
                     });
+
+                    var rowdata = [];
+                    for (var i = 0; i < d.data.length; i++) {
+                        //瀛愯〃  璧嬪��
+                        rowdata.push({
+                            "HTAXBENCHMARK": d.data[0].搴旂撼绋庨鍩哄噯, "FTAXRATEID": d.data[0].绋庣巼id, "绋庣巼浠g爜": d.data[0].绋庣巼浠g爜, "绋庣巼鍚嶇О": d.data[0].绋庣巼鍚嶇О, "FTAXBENCHMARKCORRVALUE": d.data[0].搴旂撼绋庨鍩哄噯淇鍊�
+                        });
+                    }
+                    option.data = rowdata;
+                    table.render(option);
+
                     form.render('checkbox');
                     form.render('select');
                 }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
index 1025219..0f7dc32 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
@@ -15,9 +15,10 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+        /* .maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -70,209 +71,219 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">璁惧淇濆吇璁板綍鍗�</div>
+                    <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% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
                     <div class="layui-tab layui-tab-card" lay-filter="TabTest">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                            <li>鏄庣粏淇℃伅</li>
-                        </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨寮�濮�</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HRepairBeginDate" class="layui-input" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨缁撴潫</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HRepairEndDate" class="layui-input" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨鍐呭</th>
+                                            <td class="bz_td">
                                                 <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HRepair" id="HRepair" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HRepairList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨缁翠慨浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmp" id="HEmp" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨椤圭洰</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HRepair" class="layui-input" id="HRepair" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HRepairID" id="HRepairID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HRepairList" id="HRepairList" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>缁翠慨瑕佹眰</th>
+                                            <td class="bz_td">
                                                 <textarea name="HRepairExplanation" id="HRepairExplanation" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鏁呴殰鐧昏鍗�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="XDHList" id="XDHList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁呴殰鐧昏鍗�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMainSourceBillNo" class="layui-input" id="HMainSourceBillNo" placeholder="閫夋嫨鏁呴殰鐧昏鍗�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off" class="layui-input">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="XDHList" id="XDHList" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璐熻矗浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HManagerName" class="layui-input" id="HManagerName" placeholder="閫夋嫨璐熻矗浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HManager" id="HManager" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;">
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
                                 <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -290,13 +301,12 @@
                                 </script>
                             </div>
                         </div>
-                    </div>
-
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                            <li>鏄庣粏淇℃伅</li>
+                        </ul>
+                    </div>                
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
@@ -532,6 +542,14 @@
                 $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
             })
 
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
             //閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index 3d5daa2..a0ca7a7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -14,10 +14,11 @@
     <script src="../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+        /* .maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -71,159 +72,180 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">璁惧鐐规璁板綍鍗�</div>
+                    <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% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>                   
                     <div class="layui-tab layui-tab-card" lay-filter="TabTest">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍩烘湰淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                            <li>鏄庣粏淇℃伅</li>
-                        </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规寮�濮�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规寮�濮�</th>
+                                            <td class="bz_td">
+                                                <input type="datetime" name="HBeginDate" class="layui-input" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规缁撴潫</th>
+                                            <td class="bz_td">
+                                                <input type="datetime" name="HEndDate" class="layui-input" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁伴噺</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;">
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
                                 <div class="layui-inline">
@@ -251,17 +273,15 @@
                                 </script>
                             </div>
                         </div>
-                    </div>
-
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
+                            <li>鏄庣粏淇℃伅</li>
+                        </ul>
                     </div>
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-
                 </form>
             </div>
         </div>
@@ -445,6 +465,14 @@
                 $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
             })
 
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {                   
+                    Pub_Close(2);             
+                });
+            })
+            //#endregion
+
             //閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
index 7c71f70..88d761a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
@@ -15,9 +15,10 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+        /*   .maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -70,15 +71,53 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
         }
     </style>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">璁惧淇濆吇璁板綍鍗�</div>
+                    <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% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
                     <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                         <ul class="layui-tab-title">
                             <li class="layui-this">鍩烘湰淇℃伅</li>
@@ -87,144 +126,130 @@
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇寮�濮�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇缁撴潫:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇寮�濮�</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HBeginDate" class="layui-input" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇缁撴潫</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HEndDate" class="layui-input" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;">
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁伴噺</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                             <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>                            
                             <div class="layui-tab-item">
                                 <div class="layui-inline">
                                     <label class="layui-form-label">璁惧淇濆吇瑙勭▼</label>
@@ -252,13 +277,7 @@
                                 </script>
                             </div>
                         </div>
-                    </div>
-
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
+                    </div>                   
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
@@ -446,6 +465,14 @@
                 $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
             })
 
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
             //閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index 37f49e5..addbbe1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -15,9 +15,10 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+        /* .maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -70,208 +71,218 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">璁惧淇濆吇璁板綍鍗�</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
-                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                            </div>
-                        </div>
+                    <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% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
                     </div>
                     <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>璁惧鏉$爜</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇寮�濮�</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HBeginDate" class="layui-input" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇缁撴潫</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HEndDate" class="layui-input" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇瑕佹眰</th>
+                                            <td class="bz_td">
+                                                <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鍙�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍗曟嵁鏃ユ湡</th>
+                                            <td class="t1_input">
+                                                <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閮ㄩ棬</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璐熻矗浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HManagerName" class="layui-input" id="HManagerName" placeholder="閫夋嫨璐熻矗浜�" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HManager" id="HManager" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇椤圭洰</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaintainItem" class="layui-input" id="HMaintainItem" placeholder="閫夋嫨淇濆吇椤圭洰" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HMaintainItemID" id="HMaintainItemID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HDotCheckItemList" id="HDotCheckItemList" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇濆吇閮ㄤ綅</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaintainPart" class="layui-input" id="HMaintainPart" placeholder="璇疯緭鍏ヤ繚鍏婚儴浣�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍚嶇О</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarName" class="layui-input" id="HBarName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" style="border-radius: 50px;">
+                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧瑙勬牸</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarSpec" class="layui-input" id="HBarSpec" placeholder="璇疯緭鍏ヨ澶囪鏍�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>璁惧鍨嬪彿</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HBarModel" class="layui-input" id="HBarModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鏁伴噺</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table style="width:80%;">
+                                    <tbody>
+                                        <tr>
+                                            <th>鍒涘缓浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鍒涘缓鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>淇敼鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>瀹℃牳鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾浜�</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>浣滃簾鏃ユ湡</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
                         <ul class="layui-tab-title">
                             <li class="layui-this">鍩烘湰淇℃伅</li>
                             <li>鍏朵粬淇℃伅</li>
                         </ul>
-                        <div class="layui-tab-content">
-                            <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇寮�濮�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇缁撴潫:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HClaim" id="HClaim" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDate" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManager" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">淇濆吇椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HMaintainItem" id="HMaintainItem" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HMaintainItemID" id="HMaintainItemID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇濆吇閮ㄤ綅:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaintainPart" id="HMaintainPart">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧瑙勬牸:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">鍒涘缓鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">淇敼鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">瀹℃牳鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾浜�:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浣滃簾鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly disabled>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                     </div>
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-
                 </form>
             </div>
         </div>
@@ -439,6 +450,15 @@
                 $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒涘缓鏃ユ湡
                 $("#HMaker").val(sessionStorage["HUserName"]);     //鍒涘缓浜�
             })
+
+             //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
             //閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index c2f9abe..307e045 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -18,7 +18,7 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+        /*.maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -72,354 +72,289 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th{
+            width:70px;
+            text-align:center;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">宸ュ簭杩涚珯鎺ユ敹鍗�</div>
-                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍗曟嵁淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                            <li>鍒跺崟淇℃伅</li>
-                            <li>鏄庣粏淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <!--鍗曟嵁淇℃伅-->
-                            <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                                        </div>
-                                    </div>
+                    <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% 2%;text-align: right;">     
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table style="width:80%;">
+                                        <tbody>
+                                            <tr>
+                                                <th>鏉″舰鐮�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佹按鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿鍚庡洖杞�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鎺ユ敹鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ帴鏀舵暟閲�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇璧勬簮</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;">
+                                                    <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" id="ProductionResources-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>宸ヤ綔涓績</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;">
+                                                    <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" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇鐝粍</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;">
+                                                    <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" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鎺ユ敹浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" readonly>
+                                                </td>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;">
+                                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍗曟嵁鏃ユ湡</th>
+                                                <td class="t1_input">
+                                                    <input type="text" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍗曟嵁鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>澶囨敞</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佽浆鍗″彿</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>褰撳墠宸ュ簭</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇缁勭粐</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浜у搧浠g爜</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浜у搧鍚嶇О</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瑙勬牸鍨嬪彿</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佽浆鍗℃暟閲�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>璁㈠崟鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>璁㈠崟璺熻釜鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇璁㈠崟鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
                                 </div>
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" name="HPRDOrg" id="HPRDOrg" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>浜у搧浠g爜:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" name="HMaterName" id="HMaterName" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HMaterID" id="HMaterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" name="HMaterModel" id="HMaterModel" class="layui-input" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>褰撳墠宸ュ簭</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="width: 80%; background-color: #efefef4d;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="CurrPro-BT" id="SerialNum-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>娴佹按鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇鐝粍</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px; ">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>鎺ユ敹浜�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber" style="width: 80%;">
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="margin-left:10px;width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鎺ユ敹鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>宸ヤ綔涓績</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark">
-                                            </div>
-                                        </div>
-                                    </div>
+                                <div class="layui-tab-item">
+                                    <table style="width:80%;">
+                                        <tbody>
+                                            <tr>
+                                                <th>鍒跺崟浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍒跺崟鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍏抽棴浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍏抽棴鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
                                 </div>
-                            </div>
-                            <!--鍏朵粬淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鎺ユ敹浠舵暟</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮2</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮3</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮4</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮5</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn layui-btn-primary" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">杩涚珯鏃堕棿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <!--鍒跺崟淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
-                                    <!--<script type="text/html" id="toolbarDemo">
+                                <!--<div class="layui-tab-item">                                
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                    <script type="text/html" id="toolbarDemo">
                                         <div class="layui-btn-container">
                                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
                                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                         </div>
-                                    </script>-->
+                                    </script>
                                     <script type="text/html" id="xuhao">
                                         {{d.LAY_TABLE_INDEX+1}}
                                     </script>
                                     <script type="text/html" id="barDemo">
                                         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
                                     </script>
-                                </div>
+                                </div>-->
                             </div>
-                            <!--鏄庣粏淇℃伅-->
-                            <div class="layui-tab-item" lay-filter="formData" id="formData" style="background-color:white;">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
-                                </div>
-                            </div>
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鍗曟嵁淇℃伅</li>
+                                <li>鍒跺崟淇℃伅</li>
+                                <!--<li>鏄庣粏淇℃伅</li>-->
+                            </ul>
                         </div>
-                    </div>
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
+                    </div>                 
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
                     <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
@@ -931,7 +866,7 @@
                 var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
                     if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                        layer.msg("绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒")
                         return;
                     }
                     txtHBarCode_KeyDown(HBarCode);
@@ -947,98 +882,143 @@
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HICMOInterID": data.hicmointerid,
-                                "lngICMOEntryID": data.lngICMOEntryID,
-                                "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                "HMaterID": data.HMaterID,
-                                "HMaterName": data.浜у搧,
-                                "HMaterNumber": data.浜у搧浠g爜,
-                                "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                "HPieceQty": data.娴佽浆鍗℃暟閲�,
-                                "HPlanQty": data.娴佽浆鍗℃暟閲�,
-                                "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                "HProcExchHinteID": data.hmainid,
-                                "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                "lngBillKey": data.hmainid,
-                                "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                "HPRDOrg": data.缁勭粐,
-                                "HPRDOrgID": data.缁勭粐
-                            });
-                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                            $("#HBarCode").css("background-color", "#efefef4d");
-                            HProcExchBillNoFlag = true;
 
-                            var HProcExchHinteID = $('#HProcExchHinteID').val();
+                            var barNo = HBarCode.substr(0, 3);
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" +"浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "lngICMOEntryID": data.lngICMOEntryID,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrg": data.缁勭粐,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    //$("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
 
-                            var HInterID = data.hmainid;
-                            //鑷姩鍖归厤娴佹按鍙�
-                            $.ajax({
-                                url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
-                                type: "GET",
-                                data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
-                                success: function (data1) {
-                                    if (data1.count == 1) {
-                                        var data = data1.data[0];
-                                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                            "lngBillSubKey": data.hsubid,
-                                            "HProcName": data.宸ュ簭,
-                                            "HProcID": data.宸ュ簭ID,
-                                            "HProcNo": data.娴佹按鍙�,
-                                            "HCenterName": data.宸ヤ綔涓績,
-                                            "HCenterID": data.HCenterID
-                                        });
-                                        $("#HProcNo").attr("readonly", "readonly");
-                                        $("#HProcNo").css("background-color", "#efefef4d");
-                                    }
-                                }
-                            })
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
 
-                            //鍔ㄦ�佸垪
-                            $.ajax({
-                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                type: "GET",
-                                data: { "HProcExchHinteID": HProcExchHinteID },
-                                success: function (data1) {
-                                    if (data1.count == 1) {
-                                        var data = [];
-                                        var col = [];
-                                        //缁欑┖鐨勬暟缁勮祴鍊�
-                                        for (var key in data1.list) {
-                                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                                        }
-                                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                                        col.push({ type: 'checkbox', fixed: 'left' });
-                                        for (var i = 0; i < data.length; i++) {
-                                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                            if ($.inArray(data[i].name, titleData) > -1) {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                            }
-                                            else {
-                                                switch (data[i].Type) {
-                                                    //int
-                                                    case 'DateTime':
-                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                                        break;
-                                                    default:
-                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                                }
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID
+                                                });
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
                                             }
                                         }
-                                    }
-                                    option = {
-                                        elem: '#mainTable',
+                                    })
+
+                                    //鍔ㄦ�佸垪
+                                    $.ajax({
                                         url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                         type: "GET",
-                                        //, cellMinWidth: 80
-                                        toolbar: '#toolbarDemo'
-                                        , where: { HProcExchHinteID: HProcExchHinteID }
-                                        , cols: [col]
-                                        , height: 500
-                                    }
-                                    table.render(option)
-                                }
-                            })                          
+                                        data: { "HProcExchHinteID": HProcExchHinteID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = [];
+                                                var col = [];
+                                                //缁欑┖鐨勬暟缁勮祴鍊�
+                                                for (var key in data1.list) {
+                                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                                }
+                                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                                                col.push({ type: 'checkbox', fixed: 'left' });
+                                                for (var i = 0; i < data.length; i++) {
+                                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                                    if ($.inArray(data[i].name, titleData) > -1) {
+                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                                    }
+                                                    else {
+                                                        switch (data[i].Type) {
+                                                            //int
+                                                            case 'DateTime':
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                                                break;
+                                                            default:
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            option = {
+                                                elem: '#mainTable',
+                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                                type: "GET",
+                                                //, cellMinWidth: 80
+                                                toolbar: '#toolbarDemo'
+                                                , where: { HProcExchHinteID: HProcExchHinteID }
+                                                , cols: [col]
+                                                , height: 500
+                                            }
+                                            table.render(option)
+                                        }
+                                    })                          
+                                    break;                                   
+                            }
+
+
                             //layer.close(index);
                             //set_InitGrid();
                             //table.render(option);
@@ -1058,7 +1038,7 @@
                         layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
-            }
+            }           
 
             //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
             $('#HProcNo').on('keydown', function (event) {
@@ -1105,6 +1085,119 @@
                 });
             }
 
+            //#region [鍩虹璧勬枡鍥炶溅鏂规硶]
+            //鐢熶骇璧勬簮
+            $('#HSourceName').on('keydown', function (event) {
+                var sBillNo = $('#HSourceName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //宸ヤ綔涓績
+            $('#HCenterName').on('keydown', function (event) {
+                var sBillNo = $('#HCenterName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //鐢熶骇鐝粍
+            $('#HGroupName').on('keydown', function (event) {
+                var sBillNo = $('#HGroupName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //鎺ユ敹浜�
+            $('#HEmpName').on('keydown', function (event) {
+                var sBillNo = $('#HEmpName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+
+            function BasicInfo_KeyDown(sBillNo) {
+                var index = layer.load();
+                var billType = sBillNo.substr(0, 3);
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+
+                            switch (billType) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "WKM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HCenterID": data.HItemID,
+                                        "HCenterName": data.宸ヤ綔涓績鍚嶇О
+                                    });
+                                    break;
+                                case "BZM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HGroupID": data.HItemID,
+                                        "HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                            }
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
             //#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
             $('body').on('keydown', function (e) {
                 var HinteID = $("#HProcExchHinteID").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index cd0e0da..a62178d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -18,7 +18,7 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
+       /* .maintitle {
             background-color: #1492ff;
             color: #fff;
             padding: 5px 10px;
@@ -72,26 +72,320 @@
         .layui-input-block {
             margin-left: 85px;
             min-height: 36px;
+        }*/
+
+        .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;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
-                    <div class="maintitle">宸ュ簭鍑虹珯鎺ユ敹鍗�</div>
-                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                    <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% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Add" 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="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table style="width:80%;">
+                                        <tbody>
+                                            <tr>
+                                                <th>鏉″舰鐮�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佹按鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿鍚庡洖杞�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍚堟牸鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鎶ュ簾鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇璧勬簮</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;">
+                                                    <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" id="ProductionResources-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>宸ヤ綔涓績</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;">
+                                                    <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" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇鐝粍</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;">
+                                                    <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" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鎿嶄綔鍛�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" readonly>
+                                                </td>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;">
+                                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>妫�楠屽憳</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HQCCheckName" class="layui-input" id="HQCCheckName" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;">
+                                                    <input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="font-weight:bolder">...</button>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍗曟嵁鏃ユ湡</th>
+                                                <td class="t1_input">
+                                                    <input type="text" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍗曟嵁鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>澶囨敞</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇缁勭粐</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇璁㈠崟鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浜у搧浠g爜</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浜у搧鍚嶇О</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瑙勬牸鍨嬪彿</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佽浆鍗″彿</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>娴佽浆鍗℃暟閲�</th>
+                                                <td class="bz_td" readonly>
+                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鏈嚭绔欐暟閲�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>璁㈠崟鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>褰撳墠宸ュ簭</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇缁勭粐</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>璁㈠崟璺熻釜鍙�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>杞笅閬�</th>
+                                                <td class="bz_td">
+                                                    <input type="checkbox" name="checkboxHLastSubProc" class="layui-input" id="checkboxHLastSubProc" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled style="border-radius: 50px;">
+                                                    <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table style="width:80%;">
+                                        <tbody>
+                                            <tr>
+                                                <th>鍒跺崟浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍒跺崟鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍏抽棴浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鍏抽棴鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾鏃ユ湡</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鍗曟嵁淇℃伅</li>
+                                <li>鍒跺崟淇℃伅</li>
+                            </ul>
+                        </div>
+                    </div>
+
+
+                    <!--<div class="layui-tab layui-tab-card" lay-filter="TabTest">
                         <ul class="layui-tab-title">
                             <li class="layui-this">鍗曟嵁淇℃伅</li>
                             <li>鍏朵粬淇℃伅</li>
                             <li>鍒跺崟淇℃伅</li>
                             <li>鏄庣粏淇℃伅</li>
                         </ul>
-                        <div class="layui-tab-content">
+                        <div class="layui-tab-content">-->
                             <!--鍗曟嵁淇℃伅-->
-                            <div class="layui-tab-item layui-show">
+                            <!--<div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
@@ -102,7 +396,84 @@
                                     </div>
                                 </div>
                                 <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">                                 
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>娴佹按鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HProcNo" style="width: 80%; background-color: #efefef4d; display: inline-block;">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HProcID" id="HProcID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 95px;">
+                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 95px;">
+                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">宸ヤ綔涓績</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HGroupID" id="HGroupID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width: 80%;margin-left:10px; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">妫�楠屽憳</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
+                                            </div>
+                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
@@ -110,6 +481,8 @@
                                                 <input type="hidden" name="HInterID" id="HInterID">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
@@ -123,8 +496,6 @@
                                                 <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
@@ -132,22 +503,16 @@
                                                 <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
                                     </div>
-                                    <div class="layui-row">                                  
+                                    <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>浜у搧浠g爜</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
+                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>浜у搧浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 95px;">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; display: inline-block;" readonly>-->
+                                                <!--<button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="width: 40px">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                </button>-->
+                                            <!--</div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
@@ -186,13 +551,9 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>娴佹按鍙�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HProcNo" style="width: 80%; background-color: #efefef4d; display: inline-block;">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HProcID" id="HProcID">
+                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 95px;">
+                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -203,85 +564,10 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">                                   
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width: 80%;margin-left:10px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇鐝粍</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HGroupID" id="HGroupID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID" id="HSourceID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">宸ヤ綔涓績</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">妫�楠屽憳</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-
-                                    </div>
-                                    <div class="layui-row">
-
-                                    </div>
                                 </div>
-                            </div>
+                            </div>-->
                             <!--鍏朵粬淇℃伅-->
-                           <div class="layui-tab-item">
+                            <!--<div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -439,9 +725,9 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
                             <!--鍒跺崟淇℃伅-->
-                            <div class="layui-tab-item">
+                            <!--<div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -510,36 +796,32 @@
                                                 <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>-->
 
                                     <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
                                     <!--<script type="text/html" id="toolbarDemo">
-                                        <div class="layui-btn-container">
-                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
-                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                        </div>
-                                    </script>-->
-                                    <script type="text/html" id="xuhao">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                        </div>
+                    </script>-->
+                                    <!--<script type="text/html" id="xuhao">
                                         {{d.LAY_TABLE_INDEX+1}}
                                     </script>
                                     <script type="text/html" id="barDemo">
                                         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
                                     </script>
                                 </div>
-                            </div>
+                            </div>-->
                             <!--鏄庣粏淇℃伅-->
-                            <div class="layui-tab-item" lay-filter="formData" id="formData" style="background-color:white;">
+                            <!--<div class="layui-tab-item" lay-filter="formData" id="formData" style="background-color:white;">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
-                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                    </div>
+                 
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
                     <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
@@ -557,13 +839,14 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
                 , laydate = layui.laydate
+                , upload = layui.upload
                 , element = layui.element;
             var params = get_UrlVars();
             var option = [];
@@ -860,98 +1143,126 @@
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HICMOInterID": data.hicmointerid,
-                                "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                "HMaterID": data.HMaterID,
-                                "HMaterName": data.浜у搧,
-                                "HMaterNumber": data.浜у搧浠g爜,
-                                "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                "HPieceQty": data.娴佽浆鍗℃暟閲�,
-                                "HPlanQty": data.娴佽浆鍗℃暟閲�,
-                                "lngBillKey": data.hmainid,
-                                "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                "HProcExchHinteID": data.hmainid,
-                                "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                "HPRDOrgID": data.缁勭粐
-                            });
-                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                            $("#HBarCode").css("background-color", "#efefef4d");
-                            HProcExchBillNoFlag = true;
 
-                            var HProcExchHinteID = $('#HProcExchHinteID').val();
+                            var barNo = HBarCode.substr(0, 3);
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    $("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
 
-                            var HInterID = data.hmainid;
-                            //鑷姩鍖归厤娴佹按鍙�
-                            $.ajax({
-                                url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
-                                type: "GET",
-                                data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
-                                success: function (data1) {
-                                    if (data1.count == 1) {
-                                        var data = data1.data[0];
-                                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                            "lngBillSubKey": data.hsubid,
-                                            "HProcName": data.宸ュ簭,
-                                            "HProcID": data.宸ュ簭ID,
-                                            "HProcNo": data.娴佹按鍙�,
-                                            "HCenterName": data.宸ヤ綔涓績,
-                                            "HCenterID": data.HCenterID,
-                                            "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
-                                        });
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID,
+                                                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                                });
 
-                                        if (data.棣栭亾宸ュ簭 == "鏄�") {
-                                            FirstEndHProcNo = 1;
-                                        } else if (data.鏈亾宸ュ簭 == "鏄�") {
-                                            FirstEndHProcNo = 2;
+                                                if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 1;
+                                                } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 2;
+                                                }
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
+                                            }
                                         }
-                                        $("#HProcNo").attr("readonly", "readonly");
-                                        $("#HProcNo").css("background-color", "#efefef4d");
+                                    })
+
+                                    option = {
+                                        elem: '#mainTable',
+                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                        //, cellMinWidth: 80
+                                        toolbar: '#toolbarDemo'
+                                        , where: { HProcExchHinteID: HProcExchHinteID }
+                                        , cols: [[
+                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
+                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+                                            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+                                            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                                            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+                                            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+                                        ]]
+                                        , height: 500
                                     }
-                                }
-                            })
-                            //$.ajax({
-                            //    url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                            //    type: "GET",
-                            //    data: { HProcExchHinteID: HProcExchHinteID},
-                            //    success: function (result) {
-                            //        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
-                            //        }
-                            //        else {
-                            //            layer.msg(result.Message);
-                            //        }
-                            //        layer.closeAll("loading");
-                            //    }
-                            //});
-
-                            option = {
-                                elem: '#mainTable',
-                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                //, cellMinWidth: 80
-                                toolbar: '#toolbarDemo'
-                                , where: { HProcExchHinteID: HProcExchHinteID }
-                                , cols: [[
-                                    { type: 'numbers', title: '搴忓彿', totalRow: true }
-                                    , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
-                                    , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
-                                    , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
-                                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
-                                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                                    , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
-                                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                                    , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                                    , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
-                                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                                    , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
-                                    , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
-                                ]]
-                                , height: 500
+                                    table.render(option)
+                                    break;
                             }
-                            table.render(option)
                             //layer.close(index);
                             //set_InitGrid();
                             //table.render(option);
@@ -971,6 +1282,175 @@
                     }
                 });
             }
+
+            //#region [鍩虹璧勬枡鍥炶溅鏂规硶]
+            //鐢熶骇璧勬簮
+            $('#HSourceName').on('keydown', function (event) {
+                var sBillNo = $('#HSourceName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //宸ヤ綔涓績
+            $('#HCenterName').on('keydown', function (event) {
+                var sBillNo = $('#HCenterName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //鐢熶骇鐝粍
+            $('#HGroupName').on('keydown', function (event) {
+                var sBillNo = $('#HGroupName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //鎿嶄綔鍛�
+            $('#HEmpName').on('keydown', function (event) {
+                var sBillNo = $('#HEmpName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown(sBillNo);
+                }
+            })
+            //妫�楠屽憳
+            $('#HQCCheckName').on('keydown', function (event) {
+                var sBillNo = $('#HQCCheckName').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    BasicInfo_KeyDown2(sBillNo);
+                }
+            })
+            
+            function BasicInfo_KeyDown(sBillNo) {
+                var index = layer.load();
+                var billType = sBillNo.substr(0, 3);
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+
+                            switch (billType) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "WKM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HCenterID": data.HItemID,
+                                        "HCenterName": data.宸ヤ綔涓績鍚嶇О
+                                    });
+                                    break;
+                                case "BZM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HGroupID": data.HItemID,
+                                        "HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                            }
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            function BasicInfo_KeyDown2(sBillNo) {
+                var index = layer.load();
+                var billType = sBillNo.substr(0, 3);
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+
+                            switch (billType) {                            
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                            }
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
 
             //#region 鏌ヨ 宸ヨ壓鍙傛暟
             function get_DisplayTech(HBillNo) {
@@ -1110,22 +1590,6 @@
             form.on('checkbox(checkboxHLastSubProc)', function (data) {
                 $("#HLastSubProc").val(data.elem.checked);
             });
-
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    if (OperationType == 1) {
-                        Pub_Close(closeType);
-                    } else if (OperationType == 3) {
-                        Pub_Close(1);
-                    } else if (OperationType == 4) {
-                        Pub_Close(1);
-                    }
-                    else if (OperationType == 2) {
-                        Pub_Close(1);
-                    }
-                });
-            })
 
             $('#HEmpNumber').on('keydown', function (event) {
                 var HEmpNumber = $("#HEmpNumber").val();
@@ -1270,7 +1734,7 @@
                                     BtnBF();
                                 }
                             }
-                            if (result.Verify == "Y") {
+                            if (data.Verify == "Y") {
                                 location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                             }
                             else {
@@ -1649,6 +2113,22 @@
             })
             //#endregion
 
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(closeType);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    } else if (OperationType == 2) {
+                        Pub_Close(1);
+                    }
+                });
+            })
+            //#endregion
+
             //#region 瀹℃牳鎸夐挳
             form.on('submit(set_CheckBill)', function () {
                 //瀹℃牳鏂规硶
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index bcc8fb9..afe2a44 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -148,6 +148,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>
+                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo3">
@@ -310,6 +311,9 @@
                         break
                     //宸ュ簭杩斿伐鍗�
                     case 'get_Fg': get_Fg();
+                        break
+                    //宸ュ簭娲惧伐鍗�
+                    case 'get_Pg': get_Pg();
                         break
                 };
             });
@@ -975,6 +979,37 @@
                 }
             }
 
+            //宸ュ簭娲惧伐
+            function get_Pg() {
+                var checkStatus = table.checkStatus('mainTable2')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "宸ュ簭娲惧伐鍗曠紪杈�"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["100%", "100%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鍒锋柊琛ㄦ牸鏁版嵁
+                                DisPlay_HideColumn();
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    } else {
+                        layer.msg('娲惧伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
             function DisPlay_HideColumn() {
                 $.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
new file mode 100644
index 0000000..eac6675
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
@@ -0,0 +1,1147 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>宸ュ簭娲惧伐缂栬緫</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">鎵撳嵃</button>
+                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>-->
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">浠诲姟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcPlanBillNo" id="HProcPlanBillNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">閿�鍞鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" value="0">
+                                                <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" value="0">
+                                            </div>
+                                        </div>                                        
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline"  >
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭璁″垝<br>寮�宸ユ棩鏈�</label>
+                                            <div class="layui-input-inline" >
+                                                <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭璁″垝<br>瀹屽伐鏃ユ湡</label>
+                                            <div class="layui-input-inline" >
+                                                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline"  >
+                                            <label class="layui-form-label">鎵瑰彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeptNumber" id="HDeptNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDep" id="btnSearchDep" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭璁″垝<br>鐢熶骇鏁伴噺</label>
+                                            <div class="layui-input-inline" >
+                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐝粍浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupNumber" id="HGroupNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchGroup" id="btnSearchGroup" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐝粍鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曚綅浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUnitNumber" id="HUnitNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曚綅鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                        
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                            <!--宸ヨ壓璺嚎ID-->
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HRoutingInterID" id="HRoutingInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:537px;">
+                                            </div>
+                                        </div>
+                                    </div>                                   
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+<script type="text/html" id="HSupFlag">
+    <select name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}">
+        <option value="false">鍚�</option>
+        <option value="true">鏄�</option>
+    </select>
+</script>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , element = layui.element;
+        var option;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = -1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HEntryID = params[params[2]];//婧愬崟瀛恑d
+        }
+
+        //宸ュ簭娲惧伐鏂板
+        if (OperationType == 1) {
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNum",
+                type: "GET",
+                data: { "HBillType": '3712' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                }
+            });
+
+            //鏌ヨ宸ュ簭娴佽浆鍗�
+            get_ProcessExchange();
+        } else if (OperationType == 3) {
+            RoadBillMain(linterid);
+        }
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //閫夋嫨璐熻矗浜�
+        form.on('submit(btnHEmpID)', function () {
+            get_btnHEmpID();
+        });
+
+        //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+        form.on('select(HSupFlag)', function (data) {
+            //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+            var elem = data.othis.parents('tr');
+            var dataindex = elem.attr("data-index");
+            $.each(option.data, function (index, value) {
+                if (value.LAY_TABLE_INDEX == dataindex) {
+                    value.HSupFlag = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                }
+            });
+        });
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
+                "HPlanTimes": 0,"HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
+                "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+                    table.render(option);
+                    for (var i = 1; i <= option.data.length; i++) {
+                        $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
+                    }
+                    form.render('select');
+                    break;
+                case 'btn-CopyLine':
+                    var copydata = JSON.stringify(data);
+                    if (data.length <= 0) {
+                        layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                    }
+                    else if (data.length > 1) {
+                        layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                    }
+                    else {
+                        var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                        var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                        table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                    }
+                    break;
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        obj.del();
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        layer.close(index);
+                    }
+                });
+            }
+
+            var data = obj.data;
+            if (obj.event == 'HPlanEndDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+            if (obj.event == 'HPlanBeginDate') {
+                var field = $(this).data('field');
+                laydate.render({
+                    elem: this.firstChild
+                    , show: true //鐩存帴鏄剧ず
+                    , closeStop: this
+                    , done: function (nowDate) {
+                        //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                        data[field] = nowDate;
+                        obj.update(data);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                    }
+                });
+            }
+
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    if (obj.event == 'HProcCheck') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '宸ュ簭鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HProcName: checkStatus.data[0].宸ュ簭
+                                    , HProcID: checkStatus.data[0].HItemID
+                                    , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+                    if (obj.event == 'HGroupCheck') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鐝粍鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HGroupName: checkStatus.data[0].鐝粍鍚嶇О
+                                    , HGroupID: checkStatus.data[0].HItemID
+                                    , HGroupNumber: checkStatus.data[0].鐝粍浠g爜
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }                    
+                    if (obj.event == 'HWorkerCheck') {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鎿嶄綔宸ュ垪琛�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+                            btn: ['纭畾', '鍙栨秷']
+                            , btn1: function (index, layero) {
+                                //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                var iframeWindow = window['layui-layer-iframe' + index];
+                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                if (checkStatus.data.length === 0) {
+                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                }
+                                obj.update({
+                                    HWorkerName: checkStatus.data[0].HName
+                                    , HWorkerID: checkStatus.data[0].HItemID
+                                    , HWorkerNumber: checkStatus.data[0].HNumber
+                                });
+
+                                layer.close(layer.index);
+                            }
+                            , btn2: function (index, layero) {
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }                    
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+            //鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
+            if (obj.event === 'isEditCheck') {
+                var flag = obj.data.isEdit;
+                var flagValue = obj.data.isEditValue;
+                if (flagValue === "false") {
+                    flagValue = "true";
+                    flag = "鏄�";
+                }
+                else if (flagValue === "true") {
+                    flagValue = "false";
+                    flag = "鍚�";
+                }
+                else {
+                    flagValue = "false";
+                    flag = "鍚�";
+                }
+                obj.update({
+                    isEdit: flag
+                    , isEditValue: flagValue
+                });
+            }
+        });
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            //if (AllowLoadData(data)) {
+                set_AddNew(data);
+            //}
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function (data) {
+            if (OperationType != "") {
+                Pub_Close(1);
+            }
+        });
+
+        //閫夋嫨宸ュ簭寮圭獥
+        form.on('submit(btnSearchProc)', function () {//宸ュ簭
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '宸ュ簭'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                    $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+                    $("#HProcID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨閮ㄩ棬寮圭獥
+        form.on('submit(btnSearchDep)', function () {//閮ㄩ棬
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '閮ㄩ棬'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
+                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨鐝粍寮圭獥
+        form.on('submit(btnSearchGroup)', function () {//鐝粍
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '鐝粍'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠g爜);
+                    $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+                    $("#HGroupID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨浜у搧寮圭獥
+        form.on('submit(btnSearchMater)', function () {//浜у搧
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '浜у搧'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //閫夋嫨鍗曚綅寮圭獥
+        form.on('submit(btnSearchUnit)', function () {//鍗曚綅
+            layer.open({
+                type: 2
+                , area: ['80%', '80%']
+                , title: '鍗曚綅'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {
+
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HUnitNumber").val(checkStatus.data[0].HNumber);
+                    $("#HUnitName").val(checkStatus.data[0].HName);
+                    $("#HUnitID").val(checkStatus.data[0].HItemID);
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) {
+                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                },
+                end: function () {
+
+                },
+                success: function (layero, index) {
+
+                }
+            })
+        });
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HPlanBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//宸ュ簭璁″垝寮�宸ユ棩鏈�
+            $("#HPlanEndDate").val(Format(new Date().setMonth(new Date().getMonth() + 1), "yyyy-MM-dd"));//宸ュ簭璁″垝瀹屽伐鏃ユ湡
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            //琛ㄥご
+            columns = [ //琛ㄥご
+                { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
+                , { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
+                , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
+                , { field: 'HGroupID', title: '鐝粍ID', hide: true }
+                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', event: "HGroupCheck" }
+                , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
+                , { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
+                , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck" }
+                , { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�' }
+                , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text' }
+                , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
+                , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
+                , { field: 'HPlanTimes', title: '璁″垝宸ユ椂', edit: 'text' }
+                , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富ID', hide: true }
+                , { field: 'HSeOrderEntryID', title: '閿�鍞瓙ID', hide: true }
+                , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿' }
+                , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
+                , { field: 'HICMOInterID', title: '浠诲姟鍗旾D', hide: true }
+                , { field: 'HProcPlanInterID', title: '宸ュ簭璁″垝鍗旾D', hide: true }
+                , { field: 'HProcPlanEntryID', title: '宸ュ簭璁″垝鍗曞瓙ID', hide: true }
+                , { field: 'HProcPlanBillNo', title: '宸ュ簭璁″垝鍗曞彿' }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
+                , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
+                , { field: 'HSourceEntryID', title: '婧愬崟瀛怚D', hide: true }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 130 }
+                , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text' }
+                , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text' }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 400
+                , cols: [columns]
+                , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                , done: function (res, curr, count) {
+                    option.data = res.data;
+                    //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                    $('.layui-form-select').find('input').unbind("blur");
+                    //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                    $('tr').each(function (e) {
+                        var $cr = $(this);
+                        var dataIndex = $cr.attr("data-index");
+                        $.each(option.data, function (index, value) {
+                            if (value.LAY_TNDEX == dataIndex) {
+                                $cr.find('input').val(value.HSupFlag);
+                            }
+                        });
+                    });
+                }
+                , done: function (res, curr, count) {
+
+                }
+            };
+            option.data = [{
+                "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
+                "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
+                "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+            }];
+            table.render(option);
+
+        }
+
+        //璐熻矗浜�
+        function get_btnHEmpID() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鑱屽憳琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HEmpID").val(checkStatus.data[0].HItemID);//璐熻矗浜篿d
+                    $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//璐熻矗浜哄悕绉�
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+            })
+        }
+
+        //鏌ヨ宸ュ簭娴佽浆鍗�
+        function get_ProcessExchange() {
+            var sWhere = "  where hmainid=" + linterid + " and  (HEntryID=" + HEntryID + " or HEntryID>" + HEntryID + ") ";
+            //缂栬緫鍔犺浇鏁版嵁
+            $.ajax({
+                url: GetWEBURL() + 'Sc_ProcExchWorkBackBill/GetProcessExchangeBillSub',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                success: function (result) {
+                    if (result.count == 1) {
+                        $("#HProcNumber").val(result.data[0]["宸ュ簭浠g爜"]);
+                        $("#HProcID").val(result.data[0]["HProcID"]);
+                        $("#HProcName").val(result.data[0]["宸ュ簭鍚嶇О"]);
+                        $("#HMaterNumber").val(result.data[0]["浜у搧浠g爜"]);
+                        $("#HMaterID").val(result.data[0]["HMaterID"]);
+                        $("#HMaterName").val(result.data[0]["浜у搧鍚嶇О"]);
+                        $("#HMaterModel").val(result.data[0]["瑙勬牸鍨嬪彿"]);
+                        //$("#HGroupID").val(result.data[0]["HGroupID"]);
+                        //$("#HGroupNumber").val(result.data[0]["鐝粍浠g爜"]);
+                        //$("#HGroupName").val(result.data[0]["鐝粍"]);
+                        $("#HUnitID").val(result.data[0]["HUnitID"]);
+                        $("#HUnitNumber").val(result.data[0]["鍗曚綅浠g爜"]);
+                        $("#HUnitName").val(result.data[0]["鍗曚綅"]);
+                        $("#HPlanQty").val(result.data[0]["鐢熶骇鏁伴噺"]);                                                            
+                        $("#HICMOBillNo").val(result.data[0]["浠诲姟鍗曞彿"]);
+                        $("#HICMOInterID").val(result.data[0]["hicmointerid"]);
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < 1; i++) {
+                            rowdata.push(
+                                {
+                                    "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                                    "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
+                                    "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": result.data[0]["浠诲姟鍗曞彿"], "HICMOInterID": 0,
+                                    "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": result.data[0]["鍗曟嵁鍙�"], "HRelationQty": 0, "HRelationMoney": 0
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index0);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData(data) {
+            
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+
+            var num_1 = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num_1.push(table.cache["mainTable"][i])
+                }
+            }
+
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num_1);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Sc_ProcessSendWork/SaveProcessSendWork",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            var sWhere = " and hmainid=" + linterid;
+            $.ajax({
+                url: GetWEBURL() + "/Sc_ProcessSendWork/Sc_ProcessSendWorkList",
+                type: "GET",
+                async: false,
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (d) {
+                    if (d.count == 1) {
+                        //涓昏〃
+                        $("#HBillNo").val(d.data[0]["鍗曟嵁鍙�"]);
+                        $("#HInterID").val(d.data[0]["hmainid"]);
+                        $("#HDate").val(Format(d.data[0]["鏃ユ湡"], "yyyy-MM-dd"));
+                        $("#HICMOBillNo").val(d.data[0]["鐢熶骇浠诲姟鍗曞彿"]);
+                        $("#HICMOInterID").val(d.data[0]["HICMOInterID"]);
+                        $("#HSeOrderBillNo").val(d.data[0]["閿�鍞鍗曞彿"]);
+                        $("#HSeOrderInterID").val(d.data[0]["HSeOrderInterID"]);
+
+                        //$("#HMaterNumber").val(d.data[0]["浜у搧浠g爜"]);
+                        //$("#HMaterID").val(d.data[0]["HMaterID"]);
+                        //$("#HMaterName").val(d.data[0]["浜у搧鍚嶇О"]);
+                        //$("#HModel").val(d.data[0]["瑙勬牸鍨嬪彿"]);
+                        //$("#HUnitID").val(d.data[0]["HUnitID"]);
+                        //$("#HUnitName").val(d.data[0]["鍗曚綅"]);
+                        //$("#HPlanQty").val(d.data[0]["璁㈠崟鏁伴噺"]);
+                        //$("#HQty").val(d.data[0]["杩斿伐鏁伴噺"]);
+                        //$("#HProcBegName").val(d.data[0]["杩斿伐寮�濮嬪伐搴�"]);
+                        //$("#HProcBegID").val(d.data[0]["HProcBegID"]);
+                        //$("#HProcEndName").val(d.data[1]["杩斿伐缁撴潫宸ュ簭"]);
+                        //$("#HProcEndID").val(d.data[1]["HProcEndID"]);
+                        //$("#HProcExchBegNO").val(d.data[0]["杩斿伐寮�濮嬫祦姘村彿"]);
+                        //$("#HProcExchEndNO").val(d.data[1]["杩斿伐缁撴潫娴佹按鍙�"]);
+                        //$("#HPRDORGID").val(d.data[0]["HPRDORGID"]);
+                        //$("#HPRDORGName").val(d.data[0]["缁勭粐"]);
+                        //$("#HICMOBillNo").val(d.data[0]["鐢熶骇璁㈠崟鍙�"]);
+                        //$("#HICMOInterID").val(d.data[0]["HICMOInterID"]);
+                        //$("#HICMOEntryID").val(d.data[0]["HICMOEntryID"]);
+                        //$("#HOrderProcNO").val(d.data[0]["璁㈠崟璺熻釜鍙�"]);
+                        //$("#HInnerBillNo").val(d.data[0]["鍐呴儴鍗曟嵁鍙�"]);
+                        //$("#HRemark").val(d.data[0]["琛ㄥご澶囨敞"]);
+                        //$("#HMakeDate").val(d.data[0]["鍒跺崟浜�"] == "" ? "" : Format(d.data[0]["鍒跺崟鏃ユ湡"], "yyyy-MM-dd"));
+                        //$("#HMaker").val(d.data[0]["鍒跺崟浜�"]);
+                        //$("#HCheckDate").val(d.data[0]["瀹℃牳浜�"] == "" ? "" : Format(d.data[0]["瀹℃牳鏃ユ湡"], "yyyy-MM-dd"));
+                        //$("#HChecker").val(d.data[0]["瀹℃牳浜�"]);
+                        //$("#HCloseDate").val(d.data[0]["鍏抽棴浜�"] == "" ? "" : Format(d.data[0]["鍏抽棴鏃ユ湡"], "yyyy-MM-dd"));
+                        //$("#HCloseMan").val(d.data[0]["鍏抽棴浜�"]);
+                        //$("#HUpDateDate").val(d.data[0]["淇敼浜�"] == "" ? "" : Format(d.data[0]["淇敼鏃ユ湡"], "yyyy-MM-dd"));
+                        //$("#HUpDater").val(d.data[0]["淇敼浜�"]);
+                        //$("#HDeleteDate").val(d.data[0]["浣滃簾浜�"] == "" ? "" : Format(d.data[0]["浣滃簾鏃ユ湡"], "yyyy-MM-dd"));
+                        //$("#HDeleteMan").val(d.data[0]["浣滃簾浜�"]);
+
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                                "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
+                                "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
+                                "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+                            });
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+
+                        for (var i = 0; i < d.data.length; i++) {
+                            //濮斿鏍囪
+                            $('#HSupFlag' + (i + 1)).find("option[value='" + d.data[i].濮斿鏍囪 + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(result.code + result.Message, { icon: 5 });
+                    }
+                }
+            })
+        }
+
+        function get_UrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        //#endregion
+    })
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
new file mode 100644
index 0000000..c6f2cfa
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
@@ -0,0 +1,628 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>宸ュ簭娲惧伐鍒楄〃</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HDate1">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <div class="layui-colla-content">
+                                    <div class="layui-row" style=" margin-bottom: 10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-block">
+                                                <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                                    <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鐗╂枡缂栫爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗″彿</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+        var sWhere = "";
+        var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+        var option = [];
+        var HModName = "Sc_ProcessSendWorkList";
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鏂板
+                case 'set_AddNew': set_AddNew();
+                    break;
+                //缂栬緫
+                case 'set_Edit': set_Edit();
+                    break;
+                //鍒犻櫎
+                case 'set_DeleteBill': set_DeleteBill();
+                    break;
+                //瀹℃牳
+                case 'set_CheckBill': set_CheckBill();
+                    break;
+                //鍒锋柊
+                case 'get_Refresh': get_Refresh();
+                    break;
+                //閫�鍑烘寜閽�
+                case 'get_Exit': Pub_Close(2);
+                //鍒楄缃�
+                case 'set_HideColumn':
+                    get_HideColumn();
+                    break;
+            };
+        });
+
+        //閲嶇疆鎸夐挳
+        form.on('submit(btnReSearch)', function (data) {
+            set_ClearQuery();
+
+        });
+
+        //鏌ヨ鎸夐挳
+        form.on('submit(btnSearch)', function (data) {
+            get_FastQuery();
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            //鏌ヨ
+            get_Display("");
+            //杞﹂棿鍒楄〃
+            getDept();
+            //鍒濆鍖栬〃鏍�
+            DisPlay_HideColumn();
+        }
+
+        //鑾峰彇杞﹂棿鍒楄〃
+        function getDept() {
+            var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+            $.ajax({
+                type: "get",
+                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+                success: function (result) {
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+                        }
+                        $("#HDeptName").append(HDeptName);
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+
+        // 鏌ヨ
+        function get_Display(sWhere) {            
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Sc_ProcessSendWork/Sc_ProcessSendWorkList',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(ajaxLoad);
+
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                }
+                            }
+                        }
+                        option = {
+                            elem: '#mainTable'
+                            , toolbar: '#toolbarDemo'
+                            , height: 800
+                            , page: true //寮�鍚垎椤�
+                            , limit: 50
+                            , limits: [50, 500, 5000, 20000]
+                            , cols: [col]
+                            , data: data1.data
+                        };
+                        table.render(option);
+
+                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            ColFilter();
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.msg(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+        }
+
+        // 蹇�熻繃婊�
+        function get_FastQuery() {
+            var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            var HMaterName = $("#HMaterName").val();//鐗╂枡
+            var HDeptName = $("#HDeptName").val();//杞﹂棿
+            var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
+            var ColName = $("#ColName").val();//澶嶉�夋
+            var Comparator = $("#Comparator").val()
+            var ColContent = $("#ColContent").val();
+
+            if (ColName != 0 && Comparator != 0) {
+                var com = "";
+                switch (Comparator) {
+                    case "7":
+                        com = "like'%" + ColContent + "%'";
+                        break;
+                    case "8":
+                        com = "like'%" + ColContent + "'";
+                        break;
+                    case "9":
+                        com = "like'" + ColContent + "%'";
+                        break;
+                    case "10":
+                        com = "not like'%" + ColContent + "%'";
+                        break;
+                    default:
+                        com = "" + Comparator + "'" + ColContent + "'";
+                        break;
+                }
+                sWhere += " and " + ColName + " " + com;
+            }
+
+
+
+            if (HDate) {
+                sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+            }
+
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            if (HMaterName) {
+                sWhere += " and 浜у搧浠g爜 like '%" + HMaterName + "%'";
+            }
+            if (HDeptName && HDeptName != "0") {
+                sWhere += " and HWorkShopID = '" + HDeptName + "'";
+            }
+            if (HProcExchBillNo) {
+                sWhere += " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'";
+            }
+
+            get_Display(sWhere);
+            sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+
+        // 閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#HMaterName").val("");//鐗╂枡
+            $("#HDeptName").val("0");//杞﹂棿
+            $("#HProcExchBillNo").val("");//娴佽浆鍗″彿
+            $("#ColContent").val("");
+            $("#ColName").val("0");
+            $("#Comparator").val("0");
+            form.render('select');
+            $("#btnSearch").click();
+            sWhere = "";
+        }
+
+        //鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鐢熶骇璁㈠崟鏂板'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=1&linterid='
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
+        // 缂栬緫
+        function set_Edit() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0].hmainid;
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璁㈠崟缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+
+        // 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_ProcessSendWork/DelProcessSendWork',
+                        type: "GET",
+                        data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+
+        }
+
+        //瀹℃牳
+        function set_CheckBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var hmainid = data[0].hmainid;
+                layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
+                    var wait = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
+                        type: "GET",
+                        data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                //鍏抽棴褰撳墠frame
+                                layer.close(wait);
+                                layer.msg(result.Message);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+            }
+
+        }
+
+        // 鍒锋柊
+        function get_Refresh() {
+            set_ClearQuery();
+            get_Display(sWhere);
+        }
+
+        //闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                colName += option.cols[0][i]["title"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+
+        //鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+
+
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠g爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠g爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠g爜", "宸ヨ壓璺嚎", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                        dataCol = data1.data[0].HGridString.split(',');
+
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            var dataCols = dataCol[i].split('|');
+                            //闅愯棌鍒�
+                            if (dataCols[1] == 1) {
+                                option.cols[0][i + 1]["hide"] = true;
+                            }
+                            //璁剧疆鍒楀
+                            if (dataCols[3] > 0) {
+                                option.cols[0][i + 1]["width"] = dataCols[3];
+                            }
+                            //璁剧疆鍐呭瀛椾綋澶у皬
+                            if (data1.data[0].HFontSize != 0) {
+                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                            } else {
+                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                            }
+                            //璁剧疆鍒楀
+                            //if (data1.data[0].HColumnWidth != 0) {
+                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                            //} else {
+                            //    option.cols[0][i + 1]["width"] = "";
+                            //}
+                            //鏄剧ず鍒�
+                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                option.cols[0][i + 1]["hide"] = false;
+                            }
+                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                            switch (dataCols[2]) {
+                                case "L":
+                                    option.cols[0][i + 1]["align"] = "left";
+                                    break;
+                                case "M":
+                                    option.cols[0][i + 1]["align"] = "center";
+                                    break;
+                                case "R":
+                                    option.cols[0][i + 1]["align"] = "right";
+                                    break;
+                            }
+                        }
+
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+
+        //鍒楁槑鏄剧ず涓嬫媺妗�
+        function ColFilter() {
+            var Organization = '<option  value="0" selected="selected" ></option>';
+            for (var i = 1; i < option.cols[0].length; i++) {
+                if (option.cols[0][i].hide != true) {
+                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                }
+            }
+            $("#ColName").empty();
+            $("#ColName").append(Organization);
+            form.render('select');
+        }
+
+        //#endregion
+
+
+
+
+
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 4611b2c..905c6d7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -874,82 +874,161 @@
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HICMOInterID": data.hicmointerid,
-                                "lngICMOEntryID": data.lngICMOEntryID,
-                                "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                "HMaterID": data.HMaterID,
-                                "HMaterName": data.浜у搧,
-                                "HMaterNumber": data.浜у搧浠g爜,
-                                "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                "HPieceQty": data.娴佽浆鍗℃暟閲�,
-                                "HPlanQty": data.娴佽浆鍗℃暟閲�,
-                                "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                "HProcExchHinteID": data.hmainid,
-                                "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                "lngBillKey": data.hmainid,
-                                "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                "HPRDOrg": data.缁勭粐,
-                                "HPRDOrgID": data.缁勭粐
-                            });
-                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                            $("#HBarCode").css("background-color", "#efefef4d");
-                            HProcExchBillNoFlag = true;
 
-                            var HProcExchHinteID = $('#HProcExchHinteID').val();
+                            var barNo = HBarCode.substr(0, 3);
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "GRM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "CGM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鍛樺伐浠g爜,
+                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                    });
+                                    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "lngICMOEntryID": data.lngICMOEntryID,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrg": data.缁勭粐,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    //$("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
 
-                            //鍔ㄦ�佸垪
-                            $.ajax({
-                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                type: "GET",
-                                data: { "HProcExchHinteID": HProcExchHinteID },
-                                success: function (data1) {
-                                    if (data1.count == 1) {
-                                        var data = [];
-                                        var col = [];
-                                        //缁欑┖鐨勬暟缁勮祴鍊�
-                                        for (var key in data1.list) {
-                                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                                        }
-                                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                                        col.push({ type: 'checkbox', fixed: 'left' });
-                                        for (var i = 0; i < data.length; i++) {
-                                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                            if ($.inArray(data[i].name, titleData) > -1) {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                            }
-                                            else {
-                                                switch (data[i].Type) {
-                                                    //int
-                                                    case 'DateTime':
-                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                                        break;
-                                                    default:
-                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                                }
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID
+                                                });
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
                                             }
                                         }
-                                    }
-                                    option = {
-                                        elem: '#mainTable',
+                                    })
+
+                                    //鍔ㄦ�佸垪
+                                    $.ajax({
                                         url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                         type: "GET",
-                                        //, cellMinWidth: 80
-                                        toolbar: '#toolbarDemo'
-                                        , where: { HProcExchHinteID: HProcExchHinteID }
-                                        , cols: [col]
-                                        , height: 500
-                                    }
-                                    table.render(option)
-                                }
-                            })
+                                        data: { "HProcExchHinteID": HProcExchHinteID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = [];
+                                                var col = [];
+                                                //缁欑┖鐨勬暟缁勮祴鍊�
+                                                for (var key in data1.list) {
+                                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                                }
+                                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                                                col.push({ type: 'checkbox', fixed: 'left' });
+                                                for (var i = 0; i < data.length; i++) {
+                                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                                    if ($.inArray(data[i].name, titleData) > -1) {
+                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                                    }
+                                                    else {
+                                                        switch (data[i].Type) {
+                                                            //int
+                                                            case 'DateTime':
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                                                break;
+                                                            default:
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            option = {
+                                                elem: '#mainTable',
+                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                                type: "GET",
+                                                //, cellMinWidth: 80
+                                                toolbar: '#toolbarDemo'
+                                                , where: { HProcExchHinteID: HProcExchHinteID }
+                                                , cols: [col]
+                                                , height: 500
+                                            }
+                                            table.render(option)
+                                        }
+                                    })
+                                    break;
+                            }
                             //layer.close(index);
                             //set_InitGrid();
                             //table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             //DisPlay_HideColumn();
-
                             layer.close(index);
                         }
                         else {

--
Gitblit v1.9.1