From f03c4d664b515ce1c4bd5f952f60d8b5d6dd6e3d Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 15 九月 2021 11:18:54 +0800
Subject: [PATCH] 优化委外工序接收单页面,新增删除功能

---
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html     |  677 ++++++++++++++++++++++++++-------------------------
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html            |   11 
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html      |    6 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html             |    6 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html        |    2 
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html |   41 ++
 6 files changed, 406 insertions(+), 337 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 7c45c9c..565cf8e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -21,6 +21,10 @@
         .layui-form-item .layui-inline {
             margin-right: 0;
         }
+        html {
+            background-color: white;
+            color: white;
+        }
     </style>
 </head>
 
@@ -850,7 +854,7 @@
             //#region 鏂板鎸夐挳
             form.on('submit(set_AddNew)', function () {//鎻愪氦
                 layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    location.replace('Cj_StationEntrustInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=1');
+                    location.replace('Cj_StationEntrustInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                 });
             })
             //#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index f5dc133..6760863 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>濮斿宸ュ簭鎺ユ敹鍗�</title>
+    <title>宸ュ簭濮斿鎺ユ敹鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -15,312 +15,358 @@
     <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 {
-            background-color: #1492ff;
-            color: #fff;
-            padding: 5px 10px;
-            border: none;
-            border-radius: 4px;
+        .layui-form-item .layui-inline {
+            margin-right: 0;
         }
-
-        .title {
-            border-left: 4px solid #1492ff;
-            padding-left: 6px;
-            margin: 20px 10px 4px;
-            font-size: 16px;
-            color: #333;
-        }
-
-        .buttom_box_little {
-            width: 100px;
-            height: 36px;
-            color: #fff;
-            background-color: #1492ff;
-            border-radius: 4px;
-            border: none;
-            margin: 10px;
+        html {
+            background-color: white;
+            color: white;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="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: 120px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                            </div>
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>-->
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                         </div>
                     </div>
-                    <div class="title">鍩烘湰淇℃伅</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;">娴佽浆鍗�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
-                                </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <h2>宸ュ簭濮斿鎺ユ敹鍗�</h2>
                             </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="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;">娴佹按鍙�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
-                                </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="HStationOutTime" id="HStationOutTime" 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="HICMOBillNo" id="HICMOBillNo" 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="HQty" id="HQty" value="0">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;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="HSQProcID-BT" id="HSQProcID-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <input type="hidden" name="HSupID" id="HSupID">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">绋庣巼</label>
-                                <div class="layui-input-block" style="margin-left: 104px;">
-                                    <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="16" style="background-color:#efefef4d;width: 80%;display: inline-block;" readonly>
-                                    <span>%</span>
-                                </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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" name="HMaterID" id="HMaterID" 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: 120px;">
-                                    <input type="text" class="layui-input" name="HPrice" id="HPrice" 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: 120px;">
-                                    <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" 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="HMoney" id="HMoney" 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: 120px;">
-                                    <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;">璁㈠崟璺熻釜鍙�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" onmouseover="this.title=this.value" 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="HInnerBillNo" id="HInnerBillNo">
-                                </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="HWWWorkOrderBillNo" id="HWWWorkOrderBillNo">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="" style="width: 85%;">
-                                <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <textarea name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <div class="title">鍏朵粬淇℃伅</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;">鍙戝嚭浠舵暟</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HPlanPieceQty" id="HPlanPieceQty" value="0" style="background-color:#efefef4d;" readonly>
+                    <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>
+                            <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
+                            <li lay-id="4" 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-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</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">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</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-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 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>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 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>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
+                                            <div class="layui-input-inline">
+                                                <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-col-xs4 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>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HProcNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSupID" id="HSupID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚◣鍗曚环</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPrice" id="HPrice" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍚◣閲戦</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">绋庣巼</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="16" style="width: 80%;display: inline-block;">
+                                                <span>%</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">濮斿宸ュ崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWWWorkOrderBillNo" id="HWWWorkOrderBillNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閫佽揣鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSendBillNo" id="HSendBillNo">
+                                                <input type="hidden" value="0" name="" id="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </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="HPieceQty" id="HPieceQty">
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HPieceQty" id="HPieceQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎺ユ敹鏃堕棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </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="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                            <!--闄勪欢淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-upload">
+                                        <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                        <div class="layui-upload-list">
+                                            <table class="layui-table">
+                                                <thead>
+                                                    <tr>
+                                                        <th>鏂囦欢鍚�</th>
+                                                        <th>澶у皬</th>
+                                                        <th>鐘舵��</th>
+                                                        <th>鎿嶄綔</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="ProImgByList">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </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="HEmpName" id="HEmpName">
-                                    <input type="hidden" value="0" name="HEmpID" id="HEmpID">
-                                </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="HBadPNL" id="HBadPNL" 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: 120px;">
-                                    <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;">閫佽揣鍗曞彿</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HSendBillNo" id="HSendBillNo" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" value="0" name="" id="">
-                                </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="HSourceName" id="HSourceName">
-                                    <input type="hidden" value="0" name="HSourceID" id="HSourceID">
-                                </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="HPrice_BHS" id="HPrice_BHS" value="0" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">涓嶅惈绋庨噾棰�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HMoney_BHS" id="HMoney_BHS" value="0" 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="HGroup" id="HGroup" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" value="0" name="HGroupID" id="HGroupID">
-                                </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="HGroup" id="HGroup" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" value="0" name="" id="">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="title">闄勪欢淇℃伅</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-upload">
-                            <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
-                            <div class="layui-upload-list">
-                                <table class="layui-table">
-                                    <thead>
-                                        <tr>
-                                            <th>鏂囦欢鍚�</th>
-                                            <th>澶у皬</th>
-                                            <th>鐘舵��</th>
-                                            <th>鎿嶄綔</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody id="ProImgByList">
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
-                        <button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                     </div>
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngBillKey" id="lngBillKey">
                     <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
                     <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
                     <input type="hidden" name="eventType" id="eventType" value="Add">
+                    <input type="hidden" name="HPrice_BHS" id="HPrice_BHS" value="0"><!--涓嶅惈绋庡崟浠�-->
+                    <input type="hidden" name="HMoney_BHS" id="HMoney_BHS" value="0"><!--涓嶅惈绋庨噾棰�-->
+                    <input type="hidden" name="HGroup" id="HGroup"><!--鐢熶骇鐝粍-->
+                    <input type="hidden" name="HGroupID" id="HGroupID" value="0"><!--鐢熶骇鐝粍-->
+                    <input type="hidden" name="HInnerBillNo" id="HInnerBillNo"><!--閫佽揣鍗曞彿-->
+                    <input type="hidden" name="HPlanPieceQty" id="HPlanPieceQty" value="0"><!--鍙戝嚭浠舵暟-->
+                    <input type="hidden" name="HBadPNL" id="HBadPNL" value="0"><!--鎶ュ簾浠舵暟-->
+                    <input type="hidden" name="HSourceName" id="HSourceName"><!--鐢熶骇璧勬簮-->
+                    <input type="hidden" name="HSourceID" id="HSourceID" value="0"><!--鐢熶骇璧勬簮-->
                 </form>
             </div>
         </div>
@@ -363,10 +409,13 @@
             var params = getUrlVars();
             if (typeof (params[params[0]]) == "undefined") {
                 var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
             } else {
                 var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 var linterid = params[params[1]];//婧愬崟id
-                var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];  //鑾峰彇鍗曟嵁鍙�
+                var closeType = params[params[4]];  //鍏抽棴绫诲瀷
             }
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
             //鍒ゆ柇鏄惁鏂板
@@ -389,7 +438,12 @@
             else if (OperationType == 3) {
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
-                //RoadBillSub(linterid);
+            }
+            else if (OperationType == 4) {
+                RoadBillMain(linterid);
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
             }
 
             function RoadBillMain(linterid)//鍔犺浇琛ㄥご
@@ -433,6 +487,18 @@
                 })
             }
 
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#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);
+                    }
+                });
+            })
 
             //鏂囦欢涓婁紶
             function PicUpload() {
@@ -538,6 +604,7 @@
             $("#HEmpID").val(sessionStorage["Czybm"]);
             $("#HEmp").val(sessionStorage["HUserName"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
             //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
             var HProcExchBillNoFlag = false;
 
@@ -665,12 +732,6 @@
                 });
             }
 
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
-                });
-            })
 
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -709,23 +770,6 @@
                 });
             });
 
-            //閫夋嫨宸ュ簭
-            form.on('submit(HSQProcID-BT)', function () {
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-
-
             //閫夋嫨渚涘簲鍟�
             form.on('submit(HSupID-BT)', function () {
                 layer.open({
@@ -743,23 +787,13 @@
                 })
             });
 
-            //閫夋嫨浜у搧
-            form.on('submit(HMateriaID-BT)', function () {//閫夋嫨浜у搧
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '浜у搧鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-                //layer.msg('绂佹閫夋嫨');
-            });
+            //#region 鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('Cj_StationEntrustOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                });
+            })
+            //#endregion
 
             //浠ヤ笂涓簂ayui妯″潡
         });
@@ -807,17 +841,6 @@
             window.open(url)
         }
 
-        //杩斿洖宸ュ簭
-        function GetHProcValue(obj) {
-            $("#HProcName").val(obj[0].宸ュ簭);
-            $("#HProcID").val(obj[0].HItemID);
-        }
-        //杩斿洖浜у搧
-        function GetHMaterNameValue(obj) {
-            $("#HMaterName").val(obj[0].HName);
-            $("#HMaterNumber").val(obj[0].HNumber);
-            $("#HMaterID").val(obj[0].HItemID);
-        }
         //杩斿洖渚涘簲鍟�
         function GetHSupValue(obj) {
             $("#HSupName").val(obj[0].HName);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
index 17648bf..0d4f60a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
@@ -13,6 +13,7 @@
     <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>
 </head>
 <body>
     <div class="layui-fluid">
@@ -236,7 +237,7 @@
             //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
             function btnIs() {
                 //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
-                $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+                //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
                 $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
                 $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
                 $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
@@ -256,7 +257,7 @@
                     case 'btn-Edit': set_ShowBill();
                         break;
                     //鍒犻櫎
-                    case 'btn-Delete': layer.msg('鍒犻櫎');
+                    case 'btn-Delete': btn_Delete();
                         break;
                     //瀹℃牳
                     case 'btn-Audit': set_CheckBill();
@@ -279,6 +280,38 @@
                 };
             });
 
+            //#region 鍒犻櫎鍗曟嵁
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm('纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', function (index) {
+                        var ajaxLoad = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/Cj_StationEntrustOutBill/del_StationEntrustOutBill',
+                            type: "GET",
+                            data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    get_FastQuery();
+                                    layer.close(ajaxLoad);
+                                } else {
+                                    layer.close(ajaxLoad);
+                                    layer.alert(result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.close(ajaxLoad);
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                        layer.close(index);
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
 
             //鏂板鍗曟嵁
             function set_AddNew() {
@@ -289,7 +322,7 @@
                     , shade: 0.6
                     , maxmin: false
                     , anim: 0
-                    , content: ['Cj_StationEntrustOutBill.html?OperationType=' + 1 + '&linterid=' + 0 + '&HBillNo' + 0, 'yes']
+                    , content: ['Cj_StationEntrustOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=0&closeType=1', 'yes']
                     , resize: false
                     , cancel: function () {
                         btnIs();
@@ -313,7 +346,7 @@
                         , shade: 0.6
                         , maxmin: false
                         , anim: 0
-                        , content: ['Cj_StationEntrustOutBill.html?OperationType=' + 3 + '&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+                        , content: ['Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
                         , resize: false
                         , cancel: function () {
                             btnIs();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 789f4a8..07dec9d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -21,6 +21,10 @@
         .layui-form-item .layui-inline {
             margin-right: 0;
         }
+        html {
+            background-color: white;
+            color: white;
+        }
     </style>
 </head>
 
@@ -524,8 +528,9 @@
             } else {
                 var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 var linterid = params[params[1]];//婧愬崟id
-                var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
-                var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];  //鑾峰彇鍗曟嵁鍙�
+                var closeType = params[params[4]];  //鍏抽棴绫诲瀷
             }
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
@@ -1084,7 +1089,7 @@
             //#region 鏂板鎸夐挳
             form.on('submit(set_AddNew)', function () {//鎻愪氦
                 layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    location.replace('Cj_StationOutBill.html?OperationType=1');
+                    location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                 });
             })
             //#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 21bf727..87d5389 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -369,7 +369,7 @@
                     , shade: 0.6
                     , maxmin: false
                     , anim: 0
-                    , content: ['Cj_StationOutBill.html?OperationType=1&linterid=0&HBillNo=0&closeType=1', 'yes']
+                    , content: ['Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=0&closeType=1', 'yes']
                     , resize: false
                     , cancel: function () {
                         btnIs();
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 8f8e2e6..e21029a 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"
@@ -20,6 +20,10 @@
         .layui-form-item .layui-inline {
             margin-right: 0;
         }
+        html {
+            background-color: white;
+            color: white;
+        }
     </style>
 </head>
 
@@ -458,7 +462,7 @@
             //#region 鏂板鎸夐挳
             form.on('submit(set_AddNew)', function () {//鎻愪氦
                 layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=1');
+                    location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                 });
             })
             //#endregion

--
Gitblit v1.9.1