#

luxiaotao1123

2022-11-28 e960d0d4ff14486f786e1601296a9be9cb3ce207

#

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

@@ -173,7 +173,8 @@

    @PostMapping(value = "/plan/approval/auth")
    @ManagerAuth
    public R approval(@RequestParam Long planId){
    public R approval(@RequestParam Long planId,
                      @RequestParam(required = false) Long planner){
        Plan plan = planService.selectById(planId);
        assert plan != null;

@@ -243,11 +244,32 @@
            default:
                return R.error();
        }


        return R.ok();
    }

    @PostMapping(value = "/plan/planner/list/auth")
    @ManagerAuth
    public R plannerList(@RequestParam Long planId){
        Plan plan = planService.selectById(planId);
        assert plan != null;

        if (plan.getSettle() != 2) {
            return R.error();
        }
        // 查找规划组长
        PlanType planType = planTypeService.selectById(plan.getPlanType());
        User planLeader = planTypeService.findPlanLeader(planType);
        if (Cools.isEmpty(planLeader)) {
            throw new CoolException("未查找到规划组长，请联系管理员");
        }
        if (!getUserId().equals(planLeader.getId())) {
            return R.error("抱歉，您没有审核的权限");
        }
        // 获取当期规划组所有成员
        List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
        return R.ok().add(users);
    }

    @RequestMapping(value = "/planQuery/auth")
    @ManagerAuth
    public R query(String condition) {

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

@@ -387,11 +387,46 @@
                    title: data.name
                }, function (i) {
                    layer.close(i);
                    //
                    if (data.settle === 2) {
                        let loadIndex = layer.load(2);
                        $.ajax({
                            url: baseUrl+"/plan/planner/list/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: {planId: data.id},
                            method: 'POST',
                            success: function (res) {
                                layer.close(loadIndex);
                                if (res.code === 200){
                                    console.log(res.data)
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg, {icon: 2});
                                }
                            }
                        })
                    } else {
                        approval(data.id);
                    }

                });
                break;
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });

    function approval(planId) {
                    let loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/plan/approval/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {planId: data.id},
            data: {planId: planId},
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
@@ -405,16 +440,7 @@
                            }
                        }
                    })
                });
                break;
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {