From 21c51b6609c33a2264d377e9321df0f87e7dbb94 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 14:30:27 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 10 +++++++++-
src/main/java/com/zy/crm/manager/controller/PlanTypeController.java | 10 ++++++++++
src/main/webapp/views/plan/plan.html | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
index f256e10..82fdf77 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java
@@ -30,6 +30,16 @@
return R.ok(planTypeService.selectById(String.valueOf(id)));
}
+ @GetMapping(value = "/planType/{id}/plan/auth")
+ @ManagerAuth
+ public R getPlanTypeOfAdd(@PathVariable("id") String id) {
+ return R.ok().add(Cools
+ .add("planType", planTypeService.selectById(String.valueOf(id)))
+ .add("userId", getUserId())
+ .add("nickName", getUser().getNickname())
+ );
+ }
+
@PostMapping(value = "/planType/list/auth")
public R list() {
return R.ok().add(planTypeService.selectList(new EntityWrapper<PlanType>().orderBy("id")));
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 1ae3c3e..393caa9 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -229,7 +229,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res0) {
- let planType = res0.data;
+ let planType = res0.data.planType;
if (res0.code === 200) {
admin.open({
type: 1,
@@ -244,6 +244,9 @@
let orderSel = loadOrderSel();
let cstmrSel = loadCstmrSel();
let userSel = loadUserSel();
+ userSel.setValue([
+ {name: res0.data.nickName, value: Number(res0.data.userId)},
+ ])
let planNeedSel = loadPlanNeedSel();
form.val('detail', {
planTypeName: planType.name
@@ -268,6 +271,11 @@
top.requireTip($('#cstmrXmlSel'));
return false;
}
+ if (!data.field.userId) {
+ layer.msg("涓氬姟鍛樹笉鑳戒负绌�", {icon: 2});
+ top.requireTip($('#userXmlSel'));
+ return false;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/plan/add/auth",
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 5d4b684..d656523 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -173,7 +173,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">涓氬姟鍛�: </label>
+ <label class="layui-form-label layui-form-required">涓氬姟鍛�: </label>
<div class="layui-input-block">
<div id="userXmlSel" name="userXmlSel">
</div>
--
Gitblit v1.9.1