From 0b83d075e78acfded07fafe8da133376b2260ef6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 10:26:16 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index e27f546..17e4cca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -13,14 +13,15 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/wrkMast/list/auth',
         page: true,
-        limit: 10,
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
             {type: 'checkbox'}
             ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true}
-            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true}
+            ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
             ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
             ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
             ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
@@ -238,7 +239,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) {
@@ -297,6 +298,27 @@
                     content: 'wrkDetl.html',
                     success: function(layero, index){
                     }
+                });
+                break;
+            // 瀹屾垚
+            case 'complete':
+                layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+                        $(".layui-laypage-btn")[0].click();
+                        layer.msg(data.wrkNo + res.msg);
+                    })
+                    layer.closeAll();
+
+                });
+                break;
+            // 鍙栨秷
+            case 'cancel':
+                layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+                        $(".layui-laypage-btn")[0].click();
+                        layer.msg(data.wrkNo + res.msg);
+                    })
+                    layer.closeAll();
                 });
                 break;
             // 璇︽儏
@@ -674,6 +696,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