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

Junjie

2023-11-07 6f3344a6bd18ba6a188aa694478ebcdbfef56b87

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

@@ -143,14 +143,45 @@
            // ,{field: 'hostId$', align: 'center',title: '所属商户'}
            ,{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: '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: '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: '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}
            ,{
                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
            // }
            ,{field: 'appleTime$', align: 'left',title: '申请日期', hide: false}
            // ,{field: 'beItem$', align: 'center',title: '立项'}
            // ,{field: 'planner', align: 'left',title: '规划员', templet:function(d){return emptyShow(d.planner)}}
@@ -171,7 +202,7 @@
            ,{field: 'updateTime$', align: 'left',title: '修改时间', hide: true}
            ,{field: 'memo', align: 'left',title: '注释', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 280}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 340}
        ]],
        request: {
            pageName: 'curr',
@@ -217,7 +248,7 @@
                var tr = $(['<tr id="upload-'+ index +'">'
                    ,'<td>'+ file.name +'</td>'
                    ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
                    ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                    ,'<td><div class="layui-progress" id="progress-id-'+ index +'" lay-filter="progress-demo-'+ index +'"><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>'
@@ -242,15 +273,24 @@
            });
        }
        ,done: function(res, index, upload){ //成功的回调
            if (res.code == 200) {
                element.progress('progress-demo-'+ index, '100%'); //执行进度条。n 即为返回的进度百分比
                layer.msg('上传成功', {icon: 1});
                $("#progress-id-" + index).html("已完成")
            }else {
                element.progress('progress-demo-'+ index, '100%'); //执行进度条。n 即为返回的进度百分比
                layer.msg('上传失败', {icon: 2});
                $("#progress-id-" + index).html("上传失败")
            }
            var that = this;
            //if(res.code == 0){ //上传成功
            var tr = that.elemList.find('tr#upload-'+ index)
                ,tds = tr.children();
            tds.eq(3).html(''); //清空操作
            delete this.files[index]; //删除文件队列已经上传成功的文件
            return;
            // return;
            //}
            this.error(index, upload);
            // this.error(index, upload);
        }
        ,allDone: function(obj){ //多文件上传完毕后的状态回调
            console.log(obj)
@@ -262,7 +302,7 @@
            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
        }
        ,progress: function(n, elem, e, index){
            element.progress('progress-demo-'+ index, n + '%'); //执行进度条。n 即为返回的进度百分比
            element.progress('progress-demo-'+ index, '90%'); //执行进度条。n 即为返回的进度百分比
        }
    });

@@ -531,6 +571,17 @@
                    }
                });
                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;
            case 'edit':
                showEditModel(data);
                break;
@@ -604,7 +655,9 @@
            data: { downloadUrl: downloadUrl },  // 传递下载链接作为参数
            success: function(response) {
                console.log(response)
                layer.msg(response.msg+',已下载至默认路径！详细下载路径：'+response.data, {icon: 1});
                // layer.msg(response.msg+',已下载至默认路径！详细下载路径：'+response.data, {icon: 1});
                layer.msg(response.msg, {icon: 1});
                location.href = response.data
        //         // window.open(baseUrl+response.msg)
        //         // 创建一个Blob对象
        //         var blob = new Blob([response]);
@@ -657,6 +710,33 @@
        })
    }

    function approvalEnd(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/plan/approvalEnd/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                planId: planId,
                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 showEditModel(mData) {
        let loadIndex = layer.load(2);