From ddb173948bcb021a0b8099a69cc3da3071f33ca4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 15:09:13 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/wrkMast/wrkMast.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index b38ca60..6b594d7 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -238,7 +238,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -303,20 +303,21 @@
             case 'complete':
                 layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo}, function(){
                     http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+                        $(".layui-laypage-btn")[0].click();
                         layer.msg(res.msg);
                     })
                     layer.closeAll();
-                    $(".layui-laypage-btn")[0].click();
+
                 });
                 break;
             // 鍙栨秷
             case 'cancel':
                 layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo}, function(){
                     http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+                        $(".layui-laypage-btn")[0].click();
                         layer.msg(res.msg);
                     })
                     layer.closeAll();
-                    $(".layui-laypage-btn")[0].click();
                 });
                 break;
             // 璇︽儏
@@ -694,6 +695,7 @@
             where: {wrk_no: param},
             page: true,
             limit: 16,
+            limits: [16, 30, 50, 100, 200, 500],
             even: true,
             toolbar: '#toolbar',
             cellMinWidth: 50,

--
Gitblit v1.9.1