From 13a34d2197b001799ef8f0f09e5b48af2add0926 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 09:25:31 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/weekly/weekly.js |   63 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index dbf955c..78a073e 100644
--- a/src/main/webapp/static/js/weekly/weekly.js
+++ b/src/main/webapp/static/js/weekly/weekly.js
@@ -5,6 +5,20 @@
 var htmlCstmrData;
 var indexS = "9999,8888";
 var indexDelSign = 0;
+let nowUserId2 = 0;
+fWeekly();
+function fWeekly() {
+    layui.jquery.ajax({
+        url: baseUrl + "/dashboard/user/id/popup/auth",
+        data:{token : localStorage.getItem('token')},
+        method: 'GET',
+        success: function (res) {
+            if (res.code === 200) {
+                nowUserId2 = res.data;
+            }
+        }
+    })
+}
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
@@ -99,22 +113,25 @@
             ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide : true}
             ,{field: 'cstmrIdsReality', align: 'center',title: '瀹為檯鐢叉柟鍗曚綅ID闆嗗悎',hide : true}
             ,{field: 'status$', align: 'center',title: '鐘舵��',hide : false}
-            ,{field: 'settle$', align: 'center',title: '杩涘害',hide : false}
             ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害',hide : true}
             ,{field: 'weeklyDailyPlan', align: 'center',title: '鏃ヨ鍒�',hide : false, toolbar: '#tbLookPlan'}
-            ,{field: 'weeklyDailyReality', align: 'center',title: '鏃ヨ绋�',hide : false, toolbar: '#tbLookReality'}
-            ,{field: 'comment', align: 'center',title: '璇勮',hide : false}
+            ,{field: 'weeklyDailyReality', align: 'center',title: '鏃ョ粨鏋�',hide : false, toolbar: '#tbLookReality'}
+            // ,{field: 'comment', align: 'center',title: '璇勮',hide : false}
             ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',hide : true}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide : true}
             ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide : true}
             ,{field: 'updateTime$', align: 'center',title: 'update_time',hide : true}
             ,{field: 'memo', align: 'center',title: '澶囨敞锛�50瀛楋級',hide : false}
-            ,{field: 'director$', align: 'center',title: '瀹℃壒浜�',hide : true}
+            ,{field: 'director$', align: 'center',title: '瀹℃牳鑺傜偣',hide : true}
+            ,{field: 'director', align: 'center',title: '瀹℃牳鑺傜偣',hide : true}
+            ,{field: 'settle', align: 'center',title: '杩涘害',hide : true}
             ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害',hide : true}
+            ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
             ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害',hide : true}
             ,{field: 'cstmrIdsPlan', align: 'center',title: '璁″垝鐢叉柟鍗曚綅ID闆嗗悎',hide : true}
             ,{field: 'weeklyAll', align: 'center',title: '鍛ㄦ暟',hide : true}
             ,{field: 'weeklyNowMonth', align: 'center',title: '褰撴湀绗嚑鍛�',hide : true}
+            ,{field: 'nowUserId', align: 'center', title: 'nowUserId', hide: true, templet:function(){ return nowUserId2 }}
             ,{field: 'weeklyYear', align: 'center',title: '骞�',hide : true}
             ,{field: 'weeklyMonth', align: 'center',title: '鏈�',hide : true}
             ,{field: 'weeklyDay', align: 'center',title: '鏃�',hide : true}
@@ -126,6 +143,9 @@
             pageSize: 'limit'
         },
         parseData: function (res) {
+            res.data.records.forEach((item,index) => {
+                item.nowUserId = nowUserId2
+            })
             return {
                 'code': res.code,
                 'msg': res.msg,
@@ -290,7 +310,6 @@
                         url: baseUrl+"/weekly/delete/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: {ids: data.id},
-                        method: 'POST',
                         traditional:true,
                         success: function (res) {
                             if (res.code === 200){
@@ -339,9 +358,9 @@
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
                                 ,{field: 'dailyTime$',width : 120, align: 'center',title: '鏃ユ湡'}
-                                ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭', edit:false}
-                                ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
-                                ,{field: 'comment', title: '璇勮', edit:false}
+                                ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭鍙婄洰鐨�', edit:false}
+                                // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
+                                // ,{field: 'comment', title: '璇勮', edit:false}
                                 ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」',  edit:false}
                                 // ,{field: 'dailyTime$', align: 'center',title: '鏃ユ姤鏃ユ湡'}
                                 // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
@@ -402,9 +421,9 @@
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
                                 ,{field: 'dailyTime$',width : 120, align: 'center',title: '鏃ユ湡'}
-                                ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭', edit:false}
-                                ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
-                                ,{field: 'comment', title: '璇勮', edit:false}
+                                ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭鍙婄洰鐨�', edit:false}
+                                // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
+                                // ,{field: 'comment', title: '璇勮', edit:true}
                                 ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」',  edit:false}
                                 // ,{field: 'dailyTime$', align: 'center',title: '鏃ユ姤鏃ユ湡'}
                                 // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
@@ -582,7 +601,12 @@
                             }
                         }
                     })
+                    location.reload();
+
                     return false;
+                });
+                $('#cancelBtn').on('click', function () {
+                    location.reload();
                 });
                 // 鏄庣粏琛ㄦ牸
                 var xxDataList = [];
@@ -596,10 +620,10 @@
                     cols: [[
                         {type: 'numbers', title: '#'}
                         ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
-                        ,{field: 'workContent', title: '宸ヤ綔鍐呭', style: 'color: blue;font-weight: bold', edit:true}
-                        ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
+                        ,{field: 'workContent', title: '宸ヤ綔鍐呭鍙婄洰鐨�', style: 'color: blue;font-weight: bold', edit:true}
+                        // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
                         ,{field: 'addr', title: '鍦板潃', style: 'color: blue;font-weight: bold', edit:true}
-                        ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:true}
+                        // ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:true}
                         ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', style: 'color: blue;font-weight: bold', edit:true}
                         // ,{field: 'dailyTime$', align: 'center',title: '鏃ユ姤鏃ユ湡'}
                         // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
@@ -856,7 +880,7 @@
     function showEditModel2(expTpe) {
         admin.open({
             type: 1,
-            title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ヨ绋�',
+            title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ョ粨鏋�',
             content: $('#editDialog').html(),
             area: '2200px',
             success: function (layero, dIndex) {
@@ -911,6 +935,7 @@
                             }
                         }
                     })
+                    location.reload();
                     return false;
                 });
                 // 鏄庣粏琛ㄦ牸
@@ -925,10 +950,10 @@
                     cols: [[
                         {type: 'numbers', title: '#'}
                         ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
-                        ,{field: 'workContent', title: '宸ヤ綔鍐呭', style: 'color: blue;font-weight: bold', edit:true}
-                        ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
+                        ,{field: 'workContent', title: '宸ヤ綔鍐呭鍙婄洰鐨�', style: 'color: blue;font-weight: bold', edit:true}
+                        // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
                         ,{field: 'addr', title: '鍦板潃', style: 'color: blue;font-weight: bold', edit:true}
-                        ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:true}
+                        // ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:false}
                         ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', style: 'color: blue;font-weight: bold', edit:true}
                         // ,{field: 'dailyTime$', align: 'center',title: '鏃ユ姤鏃ユ湡'}
                         // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
@@ -1210,8 +1235,10 @@
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {
     parent.layer.closeAll();
+    location.reload();
 });
 
+
 function tableReload(child) {
     var searchData = {};
     $.each($('#search-box [name]').serializeArray(), function() {

--
Gitblit v1.9.1