From 674aef62d298f9fbce41b9b1725c71d056dfd55b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 03 四月 2024 10:26:32 +0800
Subject: [PATCH] #周计划

---
 src/main/webapp/static/js/weekly/weekly.js |  197 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 175 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index 01194a5..47d267b 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({
@@ -21,6 +35,8 @@
     admin = layui.admin;
 
     $('#organization').html(localStorage.getItem('nickname') + ' <i class="layui-icon">&#xe61a;</i>');
+    $(".laytable-cell-2-0-7").css('color', 'rgba(0, 0, 0, 0)');
+
 
     // 閮ㄩ棬浜哄憳 绛涢��
     dropdown.render({
@@ -97,7 +113,6 @@
             ,{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'}
@@ -107,12 +122,16 @@
             ,{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}
@@ -288,7 +307,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){
@@ -336,7 +354,7 @@
                             cols: [[
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
-                                ,{field: 'dailyTime$', 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}
@@ -346,7 +364,7 @@
                                 // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                                 // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
                                 // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                                ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
+                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'memo', align: 'center',title: '澶囨敞',   edit:false}
                             ]],
                             request: {
@@ -399,7 +417,7 @@
                             cols: [[
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
-                                ,{field: 'dailyTime$', 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}
@@ -409,7 +427,7 @@
                                 // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                                 // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
                                 // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                                ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
+                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'memo', align: 'center',title: '澶囨敞',   edit:false}
                             ]],
                             request: {
@@ -435,8 +453,84 @@
                     }
                 });
                 break;
+            case 'approval':
+                layer.confirm('瀹℃壒閫氳繃锛�', {
+                    skin: 'layui-layer-admin',
+                    shade: .1,
+                    offset: '200px',
+                    title: data.name
+                }, function (i) {
+                    layer.close(i);
+                    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;
         }
     });
+
+    function approvalEnd(weeklyId, plannerId, dIdx) {
+        let loadIndex = layer.load(2);
+        $.ajax({
+            url: baseUrl+"/weekly/approvalEnd/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: {
+                weeklyId: weeklyId,
+                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 approval(weeklyId, plannerId, dIdx) {
+        let loadIndex = layer.load(2);
+        $.ajax({
+            url: baseUrl+"/weekly/approval/auth",
+            headers: {'token': localStorage.getItem('token')},
+            data: {
+                weeklyId: weeklyId,
+                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});
+                }
+            }
+        })
+    }
 
     // 鎼滅储
     form.on('submit(search)', function (data) {
@@ -504,7 +598,12 @@
                             }
                         }
                     })
+                    location.reload();
+
                     return false;
+                });
+                $('#cancelBtn').on('click', function () {
+                    location.reload();
                 });
                 // 鏄庣粏琛ㄦ牸
                 var xxDataList = [];
@@ -520,6 +619,7 @@
                         ,{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: 'addr', 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: '鏃ユ姤鏃ユ湡'}
@@ -541,7 +641,7 @@
                     },
                     done: function (res, curr, count) {
                         $(".layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
-                        $(".laytable-cell-2-0-6").css('color', 'rgba(0, 0, 0, 0)');
+                        $(".laytable-cell-2-0-7").css('color', 'rgba(0, 0, 0, 0)');
 
                         $(layero).find('.layui-table-view').css('margin', '0');
                         var options = this;
@@ -549,29 +649,22 @@
                         // 鑾峰彇褰撳墠琛屾暟鎹�
                         table.getRowData = function(elem){
                             var index = $(elem).closest('tr').data('index');
-                            console.log("index-----")
-                            console.log(index)
                             var indexArray = indexS.split(","); // 灏嗗瓧绗︿覆鎷嗗垎涓烘暟缁�
                             // 閬嶅巻鏁扮粍涓殑姣忎釜鍏冪礌
                             for (var i = 0; i < indexArray.length; i++) {
                                 var element = Number(indexArray[i]);
                                 // 杩涜鐩稿簲鐨勬搷浣�
-                                console.log("element-----");
-                                console.log(element);
                                 if (element===index){
                                     indexSign = 1;
                                 }
                             }
                             if (indexSign === 0){
                                 indexS = indexS+","+index;
-                                console.log("indexS-----")
-                                console.log(indexS)
                             }
                             return table.cache[options.id][index] || {};
                         };
 
                         if (indexSign === 0 && indexDelSign === 0){
-                            console.log("娓叉煋")
                             // 娓叉煋鎼滅储妯℃澘
                             $.ajax({
                                 url: baseUrl+"/cstmr/all/get/kv",
@@ -582,10 +675,10 @@
                                 method: 'POST',
                                 // async: false, // 璁剧疆涓哄悓姝ユ墽琛�
                                 success: function (res) {
-                                    console.log(res)
-                                    console.log($("#cstmrId").html())
+                                    // console.log(res)
+                                    // console.log($("#cstmrId").html())
                                     res.data.forEach((item) => {
-                                        console.log(item)
+                                        // console.log(item)
                                         $("#cstmrId").append("<option value='" + item.value  + "';"+" class=\"cstmrDetl\""+">" + item.name + "</option>")
                                     })
                                 }
@@ -593,7 +686,7 @@
                         }
 
                         $('.select-cstmr').on('change', function(){
-                            console.log("cstmrId")
+                            // console.log("cstmrId")
                             var value = this.value; // 鑾峰彇閫変腑椤� value
                             var data = table.getRowData(this);
                             xxDataList.forEach(res => {
@@ -839,6 +932,7 @@
                             }
                         }
                     })
+                    location.reload();
                     return false;
                 });
                 // 鏄庣粏琛ㄦ牸
@@ -855,6 +949,7 @@
                         ,{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: 'addr', 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: '鏃ユ姤鏃ユ湡'}
@@ -876,19 +971,52 @@
                     },
                     done: function (res, curr, count) {
                         $(".layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
-                        // $(".laytable-cell-2-0-6").css('color', 'rgba(0, 0, 0, 0)');
+                        $(".laytable-cell-2-0-6").css('color', 'rgba(0, 0, 0, 0)');
 
                         $(layero).find('.layui-table-view').css('margin', '0');
                         var options = this;
-
+                        var indexSign = 0;
                         // 鑾峰彇褰撳墠琛屾暟鎹�
                         table.getRowData = function(elem){
                             var index = $(elem).closest('tr').data('index');
+                            var indexArray = indexS.split(","); // 灏嗗瓧绗︿覆鎷嗗垎涓烘暟缁�
+                            // 閬嶅巻鏁扮粍涓殑姣忎釜鍏冪礌
+                            for (var i = 0; i < indexArray.length; i++) {
+                                var element = Number(indexArray[i]);
+                                // 杩涜鐩稿簲鐨勬搷浣�
+                                if (element===index){
+                                    indexSign = 1;
+                                }
+                            }
+                            if (indexSign === 0){
+                                indexS = indexS+","+index;
+                            }
                             return table.cache[options.id][index] || {};
                         };
 
+                        if (indexSign === 0 && indexDelSign === 0){
+                            // 娓叉煋鎼滅储妯℃澘
+                            $.ajax({
+                                url: baseUrl+"/cstmr/all/get/kv",
+                                headers: {'token': localStorage.getItem('token')},
+                                data: {
+                                    limit: 9999
+                                },
+                                method: 'POST',
+                                // async: false, // 璁剧疆涓哄悓姝ユ墽琛�
+                                success: function (res) {
+                                    // console.log(res)
+                                    // console.log($("#cstmrId").html())
+                                    res.data.forEach((item) => {
+                                        // console.log(item)
+                                        $("#cstmrId").append("<option value='" + item.value  + "';"+" class=\"cstmrDetl\""+">" + item.name + "</option>")
+                                    })
+                                }
+                            })
+                        }
+
                         $('.select-cstmr').on('change', function(){
-                            console.log("cstmrId")
+                            // console.log("cstmrId")
                             var value = this.value; // 鑾峰彇閫変腑椤� value
                             var data = table.getRowData(this);
                             xxDataList.forEach(res => {
@@ -898,6 +1026,29 @@
                                     res.cstmrId = value;
                                 }
                             })
+                        });
+
+                        $(document).ready(function () {
+                            $.ajax({
+                                url: baseUrl + "/cstmr/all/get/kv",
+                                headers: { 'token': localStorage.getItem('token') },
+                                data: {
+                                    limit: 9999
+                                },
+                                method: 'POST',
+                                success: function (res) {
+                                    if (res.code === 200) {
+                                        // console.log("res111111111111")
+                                        // console.log(res)
+                                        var template = $('#cstmrId').html(); // 鑾峰彇妯℃澘鍐呭
+                                        var compiledTemplate = Handlebars.compile(template); // 缂栬瘧妯℃澘
+                                        var html = compiledTemplate(res.data); // 灏嗘暟鎹簲鐢ㄥ埌妯℃澘涓�
+                                        $('.select-cstmr').html(html); // 娓叉煋妯℃澘鍒伴〉闈�
+                                    } else {
+                                        // 澶勭悊寮傚父鎯呭喌
+                                    }
+                                }
+                            });
                         });
                     },
                     size: ''
@@ -1081,8 +1232,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