From d71ab44ea0f9e29a5fe3a164e0c12583811a3918 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 08 八月 2022 15:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index b1c0fde..6551033 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -29,15 +29,15 @@
                                     </div>
                                 </div>
                                 <!--<div class="layui-inline">
-        <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
-        <div class="layui-input-block">
-            <select name="HBillType" id="HBillType">
-                <option value="">鎵�鏈�</option>
-                <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
-                <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
-            </select>
-        </div>
-    </div>-->
+                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                    <div class="layui-input-block">
+                                        <select name="HBillType" id="HBillType">
+                                            <option value="">鎵�鏈�</option>
+                                            <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+                                            <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+                                        </select>
+                                    </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -80,8 +80,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -94,6 +94,7 @@
     <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>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -118,7 +119,7 @@
 
             //鍒濆鍖栭〉闈㈠姞杞�
             set_ClearBill();
-           
+
 
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -149,8 +150,7 @@
                         get_PrintReport();
                         break;
                     //閫�鍑烘寜閽�
-                    case 'btn-Close':
-                        parent.layui.admin.events.closeThisTabs();
+                    case 'btn-exit': Pub_Close(2);
                         break;
                 };
             });
@@ -370,7 +370,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
-            
+
 
             //#endregion
         });

--
Gitblit v1.9.1