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

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

 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: '主ID', hide: true}
            ,{field: 'assistantPlanId', align: 'left',title: '副ID', hide: true}
            // ,{field: 'assistantPlanIdSignType', align: 'left',title: '集成货架标志', hide: true}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 340}
        ]],
        request: {
@@ -597,6 +602,9 @@
                    approvalEnd(data.id);
                });
                break;
            case 'assistantPlan':
                assistantPlan(data);
                break;
            case 'edit':
                showEditModel(data);
                break;
@@ -604,18 +612,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 +660,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: '主ID', hide: true}
                                ,{field: 'assistantPlanId', align: 'left',title: '副ID', 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 +916,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('确定要删除选中数据吗？', {