From e960d0d4ff14486f786e1601296a9be9cb3ce207 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:29:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 28 ++++++++++++-
src/main/webapp/static/js/plan/plan.js | 60 +++++++++++++++++++++--------
2 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 45d112f..b66b0f3 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/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) {
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 2023dcf..ad32884 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -387,24 +387,29 @@
title: data.name
}, function (i) {
layer.close(i);
- let loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/plan/approval/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {planId: 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});
+ //
+ 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':
@@ -416,6 +421,27 @@
}
});
+ function approval(planId) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/plan/approval/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {planId: planId},
+ 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 showEditModel(mData) {
let loadIndex = layer.load(2);
--
Gitblit v1.9.1