#报价完善

LSH

2023-08-16 de07d16d483d1d2fc6f3dd238829979ab3c5e161

#报价完善

 src/main/java/com/zy/crm/common/model/SettleDto.java

@@ -71,7 +71,7 @@
        return list;
    }

    public static List<SettleDto> initPriQuote(Plan plan, User manager) {
    public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
        List<SettleDto> list = new ArrayList<>();
        for (int i = 1; i < 6; i++) {
            SettleDto dto = new SettleDto();
@@ -79,9 +79,9 @@
            switch (i) {
                case 1:
                    dto.setTitle("开始");
                    dto.setMsg(plan.getUserId$() + "创建了审批");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());
                    dto.setMsg(user.getUsername() + "创建了审批");
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getUsername());
                    dto.setTime(DateUtils.convert(new Date()));
                    dto.setCurr(Boolean.TRUE);
                    list.add(dto);
@@ -94,13 +94,15 @@
                    break;
                case 3:
                    dto.setTitle("总裁办审核");
                    dto.setUserId(president.getId());
                    dto.setUsername(president.getNickname());
                    list.add(dto);
                    break;
//                case 4:
//                    dto.setTitle("业务员审核");
//                    list.add(dto);
//                    break;
                case 4:
                    dto.setTitle("业务员审核");
                    list.add(dto);
                    break;
                case 5:
                    dto.setTitle("审批通过");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());

 src/main/java/com/zy/crm/common/utils/TreeUtils.java

@@ -192,6 +192,9 @@
            map.put("icon", "layui-icon layui-icon-friends");
            result.add(map);
        } else {
            if (role.getId()==1){
                id="19";
            }
            Dept dept = deptService.selectById(id);
            // 主节点
            Map<String, Object> map = new HashMap<>();

 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java

@@ -76,7 +76,7 @@
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<PriQuote> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId");
        wrapper.in("member_id", getUserRoleBelongsToUserId());
        excludeTrash(param);
        convert(param, wrapper);
@@ -135,6 +135,8 @@
        priQuote.setUserId(getUserId());
        //更新人员
        priQuote.setUpdateUserId(getUserId());
        //所属部门
        priQuote.setDeptId(getDeptId());
        //更新时间
        priQuote.setUpdateTime(new Date());

@@ -148,7 +150,8 @@
        priQuote.setForm(JSON.toJSONString(map));     // 自定义表单内容
        priQuote.setSettle(1);  // 1.开始
        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager)));
        User president = userService.selectOne(new EntityWrapper<User>().eq("role_id",1).eq("username","王开杰"));        // 获取总裁办确认人
        priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));

        planService.updateById(plan);

@@ -420,7 +423,126 @@
    @PostMapping(value = "/priQuote/approval/auth")
    @ManagerAuth
    public R approvalPriQuote(@RequestParam Long planId,
                      @RequestParam(required = false) Long plannerId){return null;}
                      @RequestParam(required = false) Long plannerId){
        PriQuote priQuote = priQuoteService.selectById(planId);
        assert priQuote != null;

        switch (priQuote.getSettle()) {
            case 1:
                // 本部门经理审核
                User user = userService.selectById(priQuote.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据
                    List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                    for (SettleDto dto : list) {
                        switch (dto.getStep()) {
                            case 1:
                                dto.setCurr(Boolean.FALSE);
                                break;
                            case 2:
                                dto.setCurr(Boolean.TRUE);
                                dto.setMsg("部门经理" + manager.getNickname() + "审批通过");
                                dto.setTime(DateUtils.convert(new Date()));
                                break;
                            default:
                                break;
                        }
                    }
                    priQuote.setSettleMsg(JSON.toJSONString(list));

                    // 修改规划单状态
                    priQuote.setSettle(2);  // 总裁办待审
                    priQuote.setUpdateUserId(getUserId());
                    priQuote.setUpdateTime(new Date());

                    if (!priQuoteService.updateById(priQuote)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }

                } else {
                    return R.error("抱歉，您没有审核的权限");
                }
                break;
            case 2:
                // 查找规划组长
                User planLeader = userService.selectOne(new EntityWrapper<User>().eq("username","王开杰"));
                if (Cools.isEmpty(planLeader)) {
                    throw new CoolException("未查找总裁办，请联系管理员");
                }
                if (!getUserId().equals(planLeader.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                User planner = userService.selectById(plannerId);
                // 修改 settle 步骤数据
                List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list) {
                    switch (dto.getStep()) {
                        case 2:
                            dto.setCurr(Boolean.FALSE);
                            break;
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("总裁办" + planLeader.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
                    }
                }
                priQuote.setSettleMsg(JSON.toJSONString(list));
                // 修改规划单状态
                priQuote.setSettle(3);  // 规划员待审
                priQuote.setUpdateUserId(getUserId());
                priQuote.setUpdateTime(new Date());

                if (!priQuoteService.updateById(priQuote)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            case 3:
                // 业务员
                User salesman0 = userService.selectById(priQuote.getUserId());
                if (!getUserId().equals(salesman0.getId())) {
                    return R.error("抱歉，您没有审核的权限");
                }
                // 修改 settle 步骤数据
                List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
                for (SettleDto dto : list1) {
                    switch (dto.getStep()) {
                        case 3:
                            dto.setCurr(Boolean.TRUE);
                            break;
                        case 4:
                            dto.setCurr(Boolean.TRUE);
                            dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
                            dto.setTime(DateUtils.convert(new Date()));
                            break;
                        default:
                            break;
                    }
                }
                priQuote.setSettleMsg(JSON.toJSONString(list1));
                // 修改规划单状态
                priQuote.setSettle(4);  // 审批通过
                priQuote.setUpdateUserId(getUserId());
                priQuote.setUpdateTime(new Date());

                if (!priQuoteService.updateById(priQuote)) {
                    throw new CoolException("审核失败，请联系管理员");
                }
                break;
            default:
                return R.error();
        }
        return R.ok("审批成功");
    }

    @PostMapping(value = "/priQuote/refuse/auth")
    @ManagerAuth
    public R refusePriQuote(@RequestParam Long planId,
                              @RequestParam(required = false) Long plannerId){
//        PriQuote priQuote = priQuoteService.selectById(planId);
//        assert priQuote != null;
//
@@ -430,14 +552,6 @@
//                User user = userService.selectById(priQuote.getUserId());
//                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
//                if (manager.getId().equals(getUserId())) {
//
//
//                    // 查找总裁办
//                    PlanType planType = planTypeService.selectById(priQuote.getPlanType());
//                    User planLeader = planTypeService.findPlanLeader(planType);
//                    if (Cools.isEmpty(planLeader)) {
//                        throw new CoolException("未查找到总裁办，请联系管理员");
//                    }
//
//                    // 修改 settle 步骤数据
//                    List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
@@ -451,10 +565,6 @@
//                                dto.setMsg("部门经理" + manager.getNickname() + "审批通过");
//                                dto.setTime(DateUtils.convert(new Date()));
//                                break;
//                            case 3:
//                                dto.setUserId(planLeader.getId());
//                                dto.setUsername(planLeader.getNickname());
//                                break;
//                            default:
//                                break;
//                        }
@@ -462,19 +572,11 @@
//                    priQuote.setSettleMsg(JSON.toJSONString(list));
//
//                    // 修改规划单状态
//                    priQuote.setSettle(2);  // 规划组长待审
//                    priQuote.setSettle(2);  // 总裁办待审
//                    priQuote.setUpdateUserId(getUserId());
//                    priQuote.setUpdateTime(new Date());
//
//                    if (!priQuoteService.updateById(priQuote)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
//                    // 添加规划组长跟进人
//                    PlanFoll planFoll = new PlanFoll();
//                    planFoll.setPlanId(priQuote.getId());
//                    planFoll.setUserId(planLeader.getId());
//                    if (!planFollService.insert(planFoll)) {
//                        throw new CoolException("审核失败，请联系管理员");
//                    }
//
@@ -484,19 +586,12 @@
//                break;
//            case 2:
//                // 查找规划组长
//                PlanType planType = planTypeService.selectById(priQuote.getPlanType());
//                User planLeader = planTypeService.findPlanLeader(planType);
//                User planLeader = userService.selectOne(new EntityWrapper<User>().eq("username","王开杰"));
//                if (Cools.isEmpty(planLeader)) {
//                    throw new CoolException("未查找到规划组长，请联系管理员");
//                }
//                if (Cools.isEmpty(planLeader)) {
//                    throw new CoolException("未查找到规划组长，请联系管理员");
//                    throw new CoolException("未查找总裁办，请联系管理员");
//                }
//                if (!getUserId().equals(planLeader.getId())) {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                if (Cools.isEmpty(plannerId)) {
//                    return R.error("指定规划员不能为空");
//                }
//                User planner = userService.selectById(plannerId);
//                // 修改 settle 步骤数据
@@ -508,12 +603,8 @@
//                            break;
//                        case 3:
//                            dto.setCurr(Boolean.TRUE);
//                            dto.setMsg("售前组长" + planLeader.getNickname() + "审批通过");
//                            dto.setMsg("总裁办" + planLeader.getNickname() + "审批通过");
//                            dto.setTime(DateUtils.convert(new Date()));
//                            break;
//                        case 4:
//                            dto.setUserId(planner.getId());
//                            dto.setUsername(planner.getNickname());
//                            break;
//                        default:
//                            break;
@@ -522,63 +613,14 @@
//                priQuote.setSettleMsg(JSON.toJSONString(list));
//                // 修改规划单状态
//                priQuote.setSettle(3);  // 规划员待审
//                priQuote.setPlanner(planner.getId());
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!priQuoteService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//
//                // 添加规划员跟进人
//                PlanFoll planFoll = new PlanFoll();
//                planFoll.setPlanId(priQuote.getId());
//                planFoll.setUserId(planner.getId());
//                if (!planFollService.insert(planFoll)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            case 3:
//                User plannerUser = userService.selectById(priQuote.getPlanner());
//                if (Cools.isEmpty(plannerUser)) {
//                    return R.error("未找到规划员");
//                }
//                if (!getUserId().equals(plannerUser.getId())) {
//                    return R.error("抱歉，您没有审核的权限");
//                }
//                // 业务员
//                User salesman = userService.selectById(priQuote.getUserId());
//                // 修改 settle 步骤数据
//                List<SettleDto> list0 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
//                for (SettleDto dto : list0) {
//                    switch (dto.getStep()) {
//                        case 3:
//                            dto.setCurr(Boolean.FALSE);
//                            break;
//                        case 4:
//                            dto.setCurr(Boolean.TRUE);
//                            dto.setMsg("规划员" + plannerUser.getNickname() + "审批通过");
//                            dto.setTime(DateUtils.convert(new Date()));
//                            break;
//                        case 5:
//                            dto.setUserId(salesman.getId());
//                            dto.setUsername(salesman.getNickname());
//                            break;
//                        default:
//                            break;
//                    }
//                }
//                priQuote.setSettleMsg(JSON.toJSONString(list0));
//                // 修改规划单状态
//                priQuote.setSettle(4);  // 审批通过
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!planService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            case 4:
//                // 业务员
//                User salesman0 = userService.selectById(priQuote.getUserId());
//                if (!getUserId().equals(salesman0.getId())) {
@@ -588,10 +630,10 @@
//                List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
//                for (SettleDto dto : list1) {
//                    switch (dto.getStep()) {
//                        case 4:
//                        case 3:
//                            dto.setCurr(Boolean.TRUE);
//                            break;
//                        case 5:
//                        case 4:
//                            dto.setCurr(Boolean.TRUE);
//                            dto.setMsg("业务员" + salesman0.getNickname() + "审批通过");
//                            dto.setTime(DateUtils.convert(new Date()));
@@ -602,18 +644,18 @@
//                }
//                priQuote.setSettleMsg(JSON.toJSONString(list1));
//                // 修改规划单状态
//                priQuote.setSettle(5);  // 审批通过
//                priQuote.setSettle(4);  // 审批通过
//                priQuote.setUpdateUserId(getUserId());
//                priQuote.setUpdateTime(new Date());
//
//                if (!planService.updateById(priQuote)) {
//                if (!priQuoteService.updateById(priQuote)) {
//                    throw new CoolException("审核失败，请联系管理员");
//                }
//                break;
//            default:
//                return R.error();
//        }
//        return R.ok("审批成功");
//    }
        return R.ok("审批成功");
    }

}

 src/main/java/com/zy/crm/manager/entity/PriQuote.java

@@ -95,8 +95,15 @@
    /**
     * 进度 1: 开始  2: 组长审核  3: 售前组长审核  4: 规划员审核  5: 审批通过
     */
    @ApiModelProperty(value= "进度 1: 开始  2: 组长审核  3: 售前审核  4: 规划员审核  5: 审批通过  ")
    @ApiModelProperty(value= "进度 1: 开始  2: 组长审核  3: 售前审核  4: 审批通过  ")
    private Integer settle;

    /**
     * 所属部门
     */
    @ApiModelProperty(value= "所属部门")
    @TableField("dept_id")
    private Long deptId;

    /**
     * 审核进度
@@ -107,11 +114,12 @@

    public PriQuote() {}

    public PriQuote(String title,String sheetData,Date createTime,String filepath) {
    public PriQuote(String title,String sheetData,Date createTime,String filepath,Integer settle) {
        this.title = title;
        this.sheetData = sheetData;
        this.createTime = createTime;
        this.filepath = filepath;
        this.settle = settle;
    }

    public String getSettle$(){
@@ -120,12 +128,10 @@
            case 1:
                return "等待组长审核";
            case 2:
                return "等待售前分配规划员";
                return "等待部门经理确认";
            case 3:
                return "等待规划员提交";
                return "等待总裁办审核";
            case 4:
                return "规划员已提交";
            case 5:
                return "审批通过";
            default:
                return String.valueOf(this.settle);

 src/main/webapp/static/js/priQuote/priQuote.js

@@ -94,12 +94,13 @@
            ,{field: 'inOrderNum', align: 'center',title: '报价编号',hide: false}
            ,{field: 'planId$', align: 'center',title: '规划单号',hide: false}
            ,{field: 'planName$', align: 'center',title: '规划单名称',hide: false}
            ,{field: 'settle$', align: 'center',title: '进度', width: 150,hide: false}
            ,{field: 'createTime$', align: 'center',title: '创建时间',hide: false}
            ,{field: 'updateTime$', align: 'center',title: '更新时间',hide: false}
            ,{field: 'memberId$', align: 'center',title: '业务员',hide: false}
            ,{field: 'userId$', align: 'center',title: '创建人员',hide: true}
            ,{field: 'updateUserId$', align: 'center',title: '更新人员',hide: false}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:200}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:280}
        ]],
        request: {
            pageName: 'curr',
@@ -239,6 +240,28 @@
    table.on('tool(priQuote)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'approval':
                layer.confirm('审批通过？', {
                    skin: 'layui-layer-admin',
                    shade: .1,
                    offset: '200px',
                    title: data.name
                }, function (i) {
                    layer.close(i);
                    approval(data.id);
                });
                break;
            case 'refuse':
                layer.confirm('拒绝？', {
                    skin: 'layui-layer-admin',
                    shade: .1,
                    offset: '200px',
                    title: data.name
                }, function (i) {
                    layer.close(i);
                    refuse(data.id);
                });
                break;
            case 'more':
                top.priQuoteByMore = data.id;
                console.log(top.priQuoteByMore)
@@ -337,6 +360,59 @@
        });
    }

    function refuse(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/priQuote/refuse/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 approval(planId, plannerId, dIdx) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/priQuote/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});
                }
            }
        })
    }

    //更新form
    function showEditForm(mData) {
        admin.open({

 src/main/webapp/views/priQuote/priQuote.html

@@ -100,6 +100,12 @@
</script>

<script type="text/html" id="operate">
    {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">审批</a>
    {{# } }}
    {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="refuse">审批拒绝</a>-->
    {{# } }}
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="quote">报价</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>

 src/main/webapp/views/priQuote/priQuote_more.html

@@ -60,22 +60,23 @@
        </div>
        <div class="layui-row">
            <!-- 数据 -->
            <div class="layui-col-md9">
                <div class="layui-card">
                    <div class="layui-card-header">
                        基本信息
                    </div>
                    <div class="layui-card-body">
<!--            <div class="layui-col-md9">-->
<!--                <div class="layui-card">-->
<!--                    <div class="layui-card-header">-->
<!--                        基本信息-->
<!--                    </div>-->
<!--                    <div class="layui-card-body">-->

                    </div>
                </div>
            </div>
<!--                    </div>-->
<!--                </div>-->
<!--            </div>-->
            <!-- 动态 -->
            <div class="layui-col-md3" style="width: 24%;margin-left: 1%">
<!--            <div class="layui-col-md3" style="width: 24%;margin-left: 1%">-->
            <div class="layui-col-md3" style="width: 100%;">
                <!-- 时间线 -->
                <div class="layui-card">
                    <div class="layui-card-header">
                        <span>报价单</span>
                        <span>流程动态</span>
                    </div>
                    <div class="layui-card-body">
                        <ul class="layui-timeline" id="timelineBox">