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

Junjie

2023-11-07 6f3344a6bd18ba6a188aa694478ebcdbfef56b87

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

@@ -143,15 +143,46 @@
            // ,{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: 'appleTime$', 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: 'appleTime$', align: 'left',title: '申请日期', hide: false}
            // ,{field: 'beItem$', align: 'center',title: '立项'}
            // ,{field: 'planner', align: 'left',title: '规划员', templet:function(d){return emptyShow(d.planner)}}
            // ,{field: 'finishTime$', align: 'center',title: '完成时间'}
@@ -165,13 +196,13 @@
            ,{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: 'status$', 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}

            ,{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 即为返回的进度百分比
        }
    });

@@ -303,6 +343,7 @@
                                    method: 'GET',
                                    success: function (res0) {
                                        let planType = res0.data.planType;
                                        console.log(planType.html)
                                        if (res0.code === 200) {
                                            admin.open({
                                                type: 1,
@@ -322,10 +363,12 @@
                                                    ])
                                                    let planNeedSel = loadPlanNeedSel();
                                                    form.val('detail', {
                                                        planTypeName: planType.name
                                                        planTypeName: planType.name,
                                                        userXmlSelPhone: res0.data.mobile
                                                    });
                                                    layDateRender();
                                                    form.on('submit(editSubmit)', function (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;
@@ -474,7 +517,7 @@
                }, function (i) {
                    layer.close(i);
                    // 指定规划员
                    if (data.settle === 2) {
                    if (data.settle === 1) {
                        admin.open({
                            type: 1,
                            area: '300px',
@@ -486,6 +529,7 @@
                                    autoRow: true,
                                    filterable: true,
                                    remoteSearch: true,
                                    clickClose: true,
                                    radio: true,
                                    remoteMethod: function (val, cb, show) {
                                        let loadIndex = layer.load(2);
@@ -525,6 +569,17 @@
                    } else {
                        approval(data.id);
                    }
                });
                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':
@@ -586,32 +641,45 @@

    // 点击下载按钮时触发文件下载
    $('#data-btn-file3').on('click', 'a', function() {
        // var downloadUrl = $(this).attr('href');
        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 请求，获取文件
        // 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);
                // 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]);
        //         // 使用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;  // 阻止默认的链接跳转行为
    });

@@ -619,6 +687,33 @@
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/plan/approval/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 approvalEnd(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/plan/approvalEnd/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                planId: planId,
@@ -809,6 +904,7 @@
            autoRow: true,
            filterable: true,
            remoteSearch: true,
            clickClose: true,
            radio: true,
            remoteMethod: function (val, cb, show) {
                $.ajax({
@@ -837,6 +933,7 @@
            autoRow: true,
            filterable: true,
            remoteSearch: true,
            clickClose: true,
            radio: true,
            remoteMethod: function (val, cb, show) {
                $.ajax({
@@ -850,11 +947,30 @@
                        if (res.code === 200) {
                            cb(res.data)
                        } else {
                            cb([]);
                            cb([]);Query/auth
                            layer.msg(res.msg, {icon: 2});
                        }
                    }
                });
            },
            on: function (data){
                if (data.change.length > 0) {
                    let orderId = data.change[0].value;
                    $.ajax({
                        url: baseUrl + "/order/" + orderId + "/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {},
                        method: 'GET',
                        success: function (res) {
                            if (res.code === 200) {
                                let cstmrSel = loadCstmrSel();
                                cstmrSel.setValue([{name: res.data.cstmrId$, value: res.data.cstmrId}]);
                            } else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    });
                }
            }
        });
    }
@@ -865,6 +981,7 @@
            autoRow: true,
            filterable: true,
            remoteSearch: true,
            clickClose: true,
            radio: true,
            remoteMethod: function (val, cb, show) {
                $.ajax({
@@ -876,7 +993,8 @@
                    method: 'POST',
                    success: function (res) {
                        if (res.code === 200) {
                            cb(res.data)
                            // cb(res.data)
                            cb([]);
                        } else {
                            cb([]);
                            layer.msg(res.msg, {icon: 2});
@@ -903,7 +1021,6 @@
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    console.log(planNeedXmlSelData)
                    planNeedXmlSel.update({
                        initValue: planNeedXmlSelData,
                        data: res.data
@@ -924,6 +1041,7 @@
            autoRow: true,
            filterable: true,
            remoteSearch: true,
            clickClose: true,
            radio: true,
            remoteMethod: function (val, cb, show) {
                $.ajax({