From 1b7cf9411e6dbf70d64dc2028fba1ee739f6966a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 03 十一月 2023 13:07:06 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/plan/plan.js |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 02f119f..518566f 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -143,14 +143,45 @@
             // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
             ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
             ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
-            ,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
+            ,{
+                field: 'name',
+                align: 'left',
+                title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�',
+                width: 220,
+                style: 'color: #1890ff;cursor:pointer',
+                event: 'more',
+                hide: false
+            }
             ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false}
-            ,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)},hide: false}
+            ,{
+                field: 'planNeed$',
+                align: 'left',
+                title: '鎵�闇�',
+                templet:function(d){
+                    return emptyShow(d.planNeed$)
+                },
+                hide: false
+            }
             ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
             ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
             // ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
-            ,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore',hide: false}
-            // ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore',hide: true}
+            ,{
+                field: 'orderId$',
+                align: 'left',
+                title: '璺熻釜椤圭洰',
+                width: 220,
+                style: 'color: #1890ff;cursor:pointer',
+                event: 'orderMore',hide: false
+            }
+            // ,{
+            //     field: 'cstmrId$',
+            //     align: 'left',
+            //     title: '鐢叉柟鍗曚綅',
+            //     width: 220,
+            //     style: 'color: #1890ff;cursor:pointer',
+            //     event: 'cstmrMore',
+            //     hide: true
+            // }
             ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false}
             // ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
             // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
@@ -165,13 +196,13 @@
             ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
             // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
             // ,{field: 'comment', align: 'center',title: '璇勮'}
-            // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+            ,{field: 'status$', align: 'center',title: '鐘舵��'}
             ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true}
             ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100}
             ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
             ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 280}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
         ]],
         request: {
             pageName: 'curr',
@@ -477,7 +508,7 @@
                 }, function (i) {
                     layer.close(i);
                     // 鎸囧畾瑙勫垝鍛�
-                    if (data.settle === 2) {
+                    if (data.settle === 1) {
                         admin.open({
                             type: 1,
                             area: '300px',
@@ -529,6 +560,17 @@
                     } else {
                         approval(data.id);
                     }
+                });
+                break;
+            case 'approvalEnd':
+                layer.confirm('瀹℃壒鎷掔粷锛�', {
+                    skin: 'layui-layer-admin',
+                    shade: .1,
+                    offset: '200px',
+                    title: data.name
+                }, function (i) {
+                    layer.close(i);
+                    approvalEnd(data.id);
                 });
                 break;
             case 'edit':
@@ -657,6 +699,33 @@
         })
     }
 
+    function approvalEnd(planId, plannerId, dIdx) {
+        let loadIndex = layer.load(2);
+        $.ajax({
+            url: baseUrl+"/plan/approvalEnd/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: {
+                planId: planId,
+                plannerId: plannerId
+            },
+            method: 'POST',
+            success: function (res) {
+                if (dIdx) {
+                    layer.close(dIdx);
+                }
+                layer.close(loadIndex);
+                if (res.code === 200){
+                    layer.msg(res.msg, {icon: 1});
+                    tableReload();
+                } else if (res.code === 403){
+                    top.location.href = baseUrl+"/";
+                } else {
+                    layer.msg(res.msg, {icon: 2});
+                }
+            }
+        })
+    }
+
     /* 寮圭獥 - 鏂板銆佷慨鏀� */
     function showEditModel(mData) {
         let loadIndex = layer.load(2);

--
Gitblit v1.9.1