From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/plan/plan.js |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index cd665f2..28807e1 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -3,6 +3,21 @@
 var treeCond;
 var admin;
 var planNeedXmlSelData;
+let nowUserId2 = 0;
+fPlan();
+function fPlan() {
+    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({
@@ -142,7 +157,7 @@
             ,{field: 'id', align: 'center',title: 'ID'}
             // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
             ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100, sort:true}
-            ,{field: 'cstmrId', align: 'left',title: '涓氬姟鍛�',hide: true, width: 100, sort:true}
+            ,{field: 'cstmrId', align: 'left',title: 'cstmrId',hide: true}
             , {
                 field: 'cstmrId$',
                 align: 'center',
@@ -152,7 +167,7 @@
                 width: 350,
                 hide: false, sort:true
             }
-            ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
+            ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 130,hide: false, sort:true}
             ,{
                 field: 'name',
                 align: 'left',
@@ -171,7 +186,8 @@
                 templet:function(d){
                     return emptyShow(d.planNeed$)
                 },
-                hide: false
+                hide: false,
+                width: 200
             }
             , {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
             ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
@@ -181,13 +197,12 @@
                 field: 'orderId$',
                 align: 'left',
                 title: '璺熻釜椤圭洰',
-                width: 220,
+                width: 120,
                 style: 'color: #1890ff;cursor:pointer',
                 event: 'orderMore',
                 hide: false,
                 sort:true
             }
-            ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true}
             // ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
             // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
             // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
@@ -201,16 +216,20 @@
             ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150, sort:true}
             // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
             // ,{field: 'comment', align: 'center',title: '璇勮'}
-            ,{field: 'statusAll$', align: 'center',title: '鐘舵��', sort:true, sort:true}
-            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true, sort:true}
+            ,{field: 'statusAll$', align: 'center',title: '鐘舵��', hide:true, sort:true,width: 100}
+            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', hide: true, sort:true,width: 120}
             ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100, sort:true}
-            ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true, sort:true}
+            ,{field: 'updateTime$', align: 'left',title: '鏇存柊鏃堕棿', hide: false, sort:true,width: 120}
             ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true, sort:true}
             ,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
-            ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+            ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false,width: 80}
             ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
             ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
             ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+            ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true,width: 120}
+            ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+            ,{field: 'userId',title: 'userId', hide: true}
+            ,{field: 'director',title: 'director', hide: true}
             // ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
         ]],
@@ -219,6 +238,9 @@
             pageSize: 'limit'
         },
         parseData: function (res) {
+            res.data.records.forEach((item,index) => {
+                item.nowUserId = nowUserId2
+            })
             return {
                 'code': res.code,
                 'msg': res.msg,
@@ -314,7 +336,7 @@
                 success: function (res) {
                     if (res.code === 200){
                         layer.close(index)
-                        console.log(res)
+                        // console.log(res)
                     } else if (res.code === 403){
                         top.location.href = baseUrl+"/";
                     } else {
@@ -323,7 +345,7 @@
                 }
             });
         }).catch((e) => {
-            console.log(e)
+            // console.log(e)
             layer.msg('涓婁紶澶辫触', {icon: 2});
             $("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触")
         })
@@ -370,7 +392,7 @@
                                     method: 'GET',
                                     success: function (res0) {
                                         let planType = res0.data.planType;
-                                        console.log(planType.html)
+                                        // console.log(planType.html)
                                         if (res0.code === 200) {
                                             admin.open({
                                                 type: 1,
@@ -395,7 +417,7 @@
                                                     });
                                                     layDateRender();
                                                     form.on('submit(editSubmit)', function (data) {
-                                                        console.log(data)
+                                                        // console.log(data)
                                                         data.field.planType = planType.id;
                                                         data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
                                                         data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
@@ -752,14 +774,14 @@
                                 ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
                                 ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
                                 ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
-                                ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
+                                // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
                             ]],
                             request: {
                                 pageName: 'curr',
                                 pageSize: 'limit'
                             },
                             parseData: function (res) {
-                                console.log(res)
+                                // console.log(res)
                                 return {
                                     'code': res.code,
                                     'msg': res.msg,

--
Gitblit v1.9.1