From 0137eb578e1353a508409d570d4f11c5ba358519 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 15 十一月 2023 15:23:34 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/plan/plan.js |  154 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 145 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index ce7b0d1..f56af0a 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -139,7 +139,7 @@
         skin: 'line',
         cols: [[
             {type: 'checkbox'}
-            // ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'id', align: 'center',title: 'ID'}
             // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
             ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
             ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
@@ -196,12 +196,17 @@
             ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
             // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
             // ,{field: 'comment', align: 'center',title: '璇勮'}
-            ,{field: 'status$', align: 'center',title: '鐘舵��'}
+            ,{field: 'statusAll$', 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}
-
+            ,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
+            ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+            ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
+            ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
+            ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+            // ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
         ]],
         request: {
@@ -246,7 +251,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-file-id-' + file.lastModified + '">鍑嗗涓婁紶</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>'
             ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
@@ -262,6 +267,9 @@
         });
 
         $('#data-btn-file3').append(tr)
+
+        element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+        element.init();
 
         _uploadFile = file
     })
@@ -279,11 +287,9 @@
         });
 
         var file = _uploadFile
-        $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
 
         putObject(file,(p) => {
-            // console.log(p)
-            $("#upload-file-id-" + file.lastModified).html("涓婁紶涓細" + (Math.round(p * 100)) + "%")
+            element.progress('progress-demo-'+ file.lastModified, (Math.round(p * 100)) + "%"); //鎵ц杩涘害鏉°��
         }).then((result) => {
             var filename = result.name
             layer.msg('涓婁紶鎴愬姛', {icon: 1});
@@ -597,6 +603,9 @@
                     approvalEnd(data.id);
                 });
                 break;
+            case 'assistantPlan':
+                assistantPlan(data);
+                break;
             case 'edit':
                 showEditModel(data);
                 break;
@@ -604,18 +613,22 @@
                 del([data.id]);
                 break;
             case "uploadLink":
+                var planIdSign = data.id;
+                if (data.assistantHostSign==1){
+                    planIdSign = data.hostPlanId;
+                }
                 // 鎵撳紑寮圭獥
                 // 鏋勫缓甯﹀弬鏁扮殑鍐呭
                 layer.open({
                     type: 1,
-                    title: '涓婁紶鏂囦欢-'+data.id,
+                    title: '涓婁紶鏂囦欢-'+planIdSign,
                     content: $('#myModal')
                 });
                 // 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
                 $.ajax({
                     url: '/plan/view/file/auth',
                     data:{
-                        planId:data.id
+                        planId:planIdSign
                     },
                     success: function(response) {
                         if (response.code==200){
@@ -648,6 +661,99 @@
                     },
                     error: function() {
                         console.log('Failed to get file list.');
+                    }
+                });
+                break;
+            case "look":
+                var $a = $(obj.tr).find('a[lay-event="look"]');
+                var offset = $a.offset();
+                var top2 = offset.top;
+                var left = offset.left;
+                layer.open({
+                    type: 1,
+                    title: false,
+                    area: '2100px',
+                    offset: [top2 + 'px', (left - 1430 + $a.outerWidth()) + 'px'],
+                    shade: .01,
+                    shadeClose: true,
+                    fixed: false,
+                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+                    success: function (layero) {
+                        table.render({
+                            elem: '#lookSSXMTable',
+                            headers: {token: localStorage.getItem('token')},
+                            url: baseUrl+'/plan/assistantPlan/view/auth',
+                            where: {
+                                hostPlanId: data.id
+                            },
+                            page: true,
+                            cellMinWidth: 100,
+                            cols: [[
+                                {field: 'id', align: 'center',title: 'ID'}
+                                ,{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: '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: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
+                                ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
+                                ,{
+                                    field: 'orderId$',
+                                    align: 'left',
+                                    title: '璺熻釜椤圭洰',
+                                    width: 220,
+                                    style: 'cursor:pointer',
+                                    event: 'orderMore',hide: false
+                                }
+                                ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false}
+                                ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
+                                ,{field: 'statusAll$', 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}
+                                ,{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}
+                            ]],
+                            request: {
+                                pageName: 'curr',
+                                pageSize: 'limit'
+                            },
+                            parseData: function (res) {
+                                console.log(res)
+                                return {
+                                    'code': res.code,
+                                    'msg': res.msg,
+                                    'count': res.data.total,
+                                    'data': res.data.records
+                                }
+                            },
+                            response: {
+                                statusCode: 200
+                            },
+                            done: function () {
+                                $(layero).find('.layui-table-view').css('margin', '0');
+                            },
+                            size: ''
+                        });
                     }
                 });
                 break;
@@ -811,6 +917,36 @@
         });
     }
 
+    /* 鏂板缓 */
+    function assistantPlan(data) {
+        layer.confirm('纭畾瑕佹柊寤鸿揣鏋惰鍒掑鎵瑰悧锛�', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/plan/assistantPlan/add/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {
+                    hostPlanId: data.id
+                },
+                method: 'POST',
+                success: function (res) {
+                    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 del(ids) {
         layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {

--
Gitblit v1.9.1