From f1549efaacbc34ab14ead2c01a7fa71f15b0e746 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 29 十一月 2023 08:32:29 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 1b3a547..cd665f2 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -142,6 +142,16 @@
             ,{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: 'center',
+                title: '瀹㈡埛鍚嶇О',
+                style: 'color: #1890ff;cursor:pointer',
+                event: 'moreCstmr',
+                width: 350,
+                hide: false, sort:true
+            }
             ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
             ,{
                 field: 'name',
@@ -163,6 +173,7 @@
                 },
                 hide: false
             }
+            , {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
             ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
             ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100, sort:true}
             // ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
@@ -176,15 +187,6 @@
                 hide: false,
                 sort:true
             }
-            // ,{
-            //     field: 'cstmrId$',
-            //     align: 'left',
-            //     title: '鐢叉柟鍗曚綅',
-            //     width: 220,
-            //     style: 'color: #1890ff;cursor:pointer',
-            //     event: 'cstmrMore',
-            //     hide: 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)}}
@@ -254,6 +256,7 @@
         var tr = $(['<tr id="upload-">'
             ,'<td id="upload-filename-id-'+ file.lastModified + '">' + file.name +'</td>'
             ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
+            ,'<td id="upload-filename-userName-'+ '">' +'</td>'
             ,'<td id="upload-file-id-' + file.lastModified + '"><div class="layui-progress layui-progress-big" lay-showPercent="true" lay-filter="progress-demo-'+ file.lastModified +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
             ,'<td>'
             ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>'
@@ -298,9 +301,9 @@
             layer.msg('涓婁紶鎴愬姛', {icon: 1});
             $("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")
             $("#upload-filename-id-" + file.lastModified).html(filename)
-
+            let token = localStorage.getItem("token");
             $.ajax({
-                url: baseUrl+"/plan/insert/file/auth",
+                url: baseUrl+"/plan/url/insert/file/auth",
                 headers: {'token': localStorage.getItem('token')},
                 data: {
                     'planId': $('.layui-layer-title').text(),
@@ -532,6 +535,18 @@
                     }
                 })
                 break;
+            case 'moreCstmr':
+                top.cstmrByMore = data.cstmrId;
+                admin.popupRight({
+                    type: 1,
+                    window: "top",
+                    area: "1250px",
+                    url: "../cstmr/cstmr_more.html",
+                    end: function () {
+                        // $(".layui-laypage-btn")[0].click();
+                    }
+                })
+                break;
             case 'approval':
                 layer.confirm('瀹℃壒閫氳繃锛�', {
                     skin: 'layui-layer-admin',
@@ -541,7 +556,7 @@
                 }, function (i) {
                     layer.close(i);
                     // 鎸囧畾瑙勫垝鍛�
-                    if (data.settle === 1) {
+                    if (data.settle === 1 && data.settleSize === 4) {
                         admin.open({
                             type: 1,
                             area: '300px',
@@ -624,14 +639,16 @@
                 // 鏋勫缓甯﹀弬鏁扮殑鍐呭
                 layer.open({
                     type: 1,
-                    title: '涓婁紶鏂囦欢-'+planIdSign,
+                    title: '涓婁紶鏂囦欢-'+planIdSign+'-'+data.id,
                     content: $('#myModal')
                 });
                 // 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
                 $.ajax({
-                    url: '/plan/view/file/auth',
+                    url: '/plan/url/view/file/auth',
+                    headers: {'token': localStorage.getItem('token')},
                     data:{
-                        planId:planIdSign
+                        planId:planIdSign,
+                        planIdI:data.id,
                     },
                     success: function(response) {
                         if (response.code==200){
@@ -648,6 +665,7 @@
                                 tr.id = "upload-"+index;
                                 tr.innerHTML = '<td>' + file.name + '</td>'
                                     + '<td>' + (file.size / 1024).toFixed(1) + 'kb</td>'
+                                    + '<td>' + file.userName + '</td>'
                                     // + '<td><div class="layui-progress" lay-filter="progress-demo-' + index ,100 + '%'+ '"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                                     + '<td>'+'宸插畬鎴�'+'</td>'
                                     + '<td>'

--
Gitblit v1.9.1