Merge remote-tracking branch 'origin/zycrm' into zycrm

whycq

2023-08-21 e62bcdc3d722bb81713ed43fb9e4b05a349ef098

 src/main/webapp/static/js/plan/plan.js

@@ -141,13 +141,13 @@
            {type: 'checkbox'}
            // ,{field: 'id', align: 'center',title: 'ID'}
            // ,{field: 'hostId$', align: 'center',title: '所属商户'}
            ,{field: 'userId$', align: 'left',title: '业务员',hide: false}
            ,{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: 'color: #1890ff;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}
            ,{field: 'planner$', align: 'left',title: '规划员',hide: false, width: 100}
            // ,{field: 'nowHeadman$', align: 'left',title: '规划组长',hide: true}
            ,{field: 'orderId$', align: 'left',title: '跟踪项目', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore',hide: false}
            // ,{field: 'cstmrId$', align: 'left',title: '甲方单位', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore',hide: true}
@@ -162,16 +162,16 @@
            // ,{field: 'planBonus', align: 'center',title: '规格奖金'}
            // ,{field: 'planLeaderBonus', align: 'center',title: '规格组长奖金'}
            // ,{field: 'files', align: 'center',title: '附件'}
            ,{field: 'settle$', align: 'center',title: '进度'}
            ,{field: 'settle$', align: 'center',title: '进度', width: 150}
            // ,{field: 'settleMsg', align: 'center',title: '审核进度'}
            // ,{field: 'comment', align: 'center',title: '评论'}
            // ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'createTime$', align: 'left',title: '添加日期', width: 160, hide: false}
            ,{field: 'updateBy$', align: 'left',title: '修改人'}
            ,{field: 'updateBy$', align: 'left',title: '修改人', width: 100}
            ,{field: 'updateTime$', align: 'left',title: '修改时间', hide: true}
            ,{field: 'memo', align: 'left',title: '注释', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 180}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 280}
        ]],
        request: {
            pageName: 'curr',
@@ -197,20 +197,19 @@
        }
    });

    //演示多文件列表
    //多文件列表
    var uploadListIns = upload.render({
        elem: '#data-btn-file2'
        ,elemList: $('#data-btn-file3') //列表元素对象
        ,url: '/plan/insert/file/auth' //此处用的是第三方的 http 请求演示，实际使用时改成您自己的上传接口即可。
        ,url: '/plan/insert/file/auth'
        ,accept: 'file'
        ,multiple: true
        ,number: 3
        ,number: 10
        ,auto: false
        ,bindAction: '#testListAction'
        ,choose: function(obj){
            console.log(obj)
            console.log(this.data)
            console.log($('.layui-layer-title').text())
            // 赋值
            this.data.planId=$('.layui-layer-title').text()
            var that = this;
            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
            //读取本地文件
@@ -222,6 +221,7 @@
                    ,'<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>'
                    ,'<button id="file-download" class="layui-btn layui-btn-xs demo-reload layui-hide">下载</button>'
                    ,'</td>'
                    ,'</tr>'].join(''));

@@ -240,9 +240,6 @@
                that.elemList.append(tr);
                element.render('progress'); //渲染新加的进度条组件
            });
        }
        ,data : {
            planId : $('.layui-layer-title').text()
        }
        ,done: function(res, index, upload){ //成功的回调
            var that = this;
@@ -264,7 +261,7 @@
                ,tds = tr.children();
            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
        }
        ,progress: function(n, elem, e, index){ //注意：index 参数为 layui 2.6.6 新增
        ,progress: function(n, elem, e, index){
            element.progress('progress-demo-'+ index, n + '%'); //执行进度条。n 即为返回的进度百分比
        }
    });
@@ -544,10 +541,90 @@
                    title: '上传文件-'+data.id,
                    content: $('#myModal')
                });
                // 获取路径下的文件列表，使用 jQuery 的 ajax 方法
                $.ajax({
                    url: '/plan/view/file/auth',
                    data:{
                        planId:data.id
                    },
                    success: function(response) {
                        if (response.code==200){
                            var targetTable = document.getElementById("data-btn-file3");
                            // var targetTable1 = document.getElementById("layui-layer2");
                            // // 获取文本内容
                            // var text = targetTable1.textContent.trim();
                            // console.log(text); // 输出 '上传文件-20'
                            targetTable.innerHTML = '';
                            // 将获取到的文件列表添加到文件队列中进行显示
                            response.data.forEach(function(file,index) {
                                // 创建tr元素
                                var tr = document.createElement("tr");
                                tr.id = "upload-"+index;
                                tr.innerHTML = '<td>' + file.name + '</td>'
                                    + '<td>' + (file.size / 1024).toFixed(1) + 'kb</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>'
                                    + '<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>'
                                    + '<a href="' + file.path + '" download class="layui-btn layui-btn-xs layui-btn-primary">下载</a>'
                                    + '</td>';
                                // 将tr元素添加到目标table中
                                targetTable.appendChild(tr);
                            });
                        }else {
                            console.log('Failed to get file list error.');
                        }
                    },
                    error: function() {
                        console.log('Failed to get file list.');
                    }
                });
                break;
        }
    });

    // 点击下载按钮时触发文件下载
    $('#data-btn-file3').on('click', 'a', function() {
        // var downloadUrl = $(this).attr('href');
        // console.log(downloadUrl)
        // // console.log(baseUrl)
        // // window.open("/\//"+downloadUrl);
        // // return false;
        // // var downloadUrl = $(this).attr('href');
        // // console.log(downloadUrl)
        // // // 发起 AJAX 请求，获取文件
        // $.ajax({
        //     url: '/plan/download/file/auth',
        //     type: 'POST',
        //     data: { downloadUrl: downloadUrl },  // 传递下载链接作为参数
        //     success: function(response) {
        //         // console.log(response)
        // //         // window.open(baseUrl+response.msg)
        // //         // 创建一个Blob对象
        // //         var blob = new Blob([response]);
        // //         // 使用FileSaver保存文件
        // //         var fileName = downloadUrl.substring(downloadUrl.lastIndexOf('\\') + 1);
        // //         console.log(fileName)
        // //         saveAs(blob, fileName);
        //         return false;
        //     },
        //     error: function() {
        //         layer.msg('请求文件下载失败');
        //     }
        // });
        var downloadUrl = $(this).attr('href');
        console.log(downloadUrl)
        if (downloadUrl == "" || downloadUrl == null) {
            layer.msg('请先上传app文件',{time:1000},() => {
                parent.location.reload()
            })
        }else{
            window.open(downloadUrl);
        }
        return false;  // 阻止默认的链接跳转行为
    });

    function approval(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({