From 8d236208458152fc8c3c19a07ffe0abaf3497fea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:48:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 4 +
src/main/webapp/static/js/plan/plan.js | 73 +++++++++++++++++++++++++++---------
src/main/webapp/views/plan/plan.html | 13 ++++++
3 files changed, 70 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 b66b0f3..6516449 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -267,7 +267,9 @@
}
// 鑾峰彇褰撴湡瑙勫垝缁勬墍鏈夋垚鍛�
List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
- return R.ok().add(users);
+ List<KeyValueVo> vos = new ArrayList<>();
+ users.forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getNickname()), item.getId())));
+ return R.ok().add(vos);
}
@RequestMapping(value = "/planQuery/auth")
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index ad32884..1ae3c3e 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -387,29 +387,58 @@
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});
- }
+ admin.open({
+ type: 1,
+ area: '300px',
+ title: '閫夋嫨瑙勫垝鍛�',
+ content: $('#plannerListDialog').html(),
+ success: function (layero, dIndex) {
+ let plannerSel = xmSelect.render({
+ el: '#plannerXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ 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) {
+ cb(res.data)
+ } else {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+ });
+
+ form.on('submit(editSubmit)', function () {
+ let plannerId = plannerSel.getValue()[0] ? plannerSel.getValue()[0].value : null;
+ if (!plannerId) {
+ layer.msg("璇烽�夋嫨瑙勫垝鍛�", {icon: 2});
+ top.requireTip($('#plannerXmlSel'));
+ return false;
+ }
+ approval(data.id, plannerId, dIndex);
+ });
+
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
}
})
} else {
approval(data.id);
}
-
});
break;
case 'edit':
@@ -421,14 +450,20 @@
}
});
- function approval(planId) {
+ function approval(planId, plannerId, dIdx) {
let loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/plan/approval/auth",
headers: {'token': localStorage.getItem('token')},
- data: {planId: planId},
+ 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});
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 401e0a0..bcf0f08 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -111,6 +111,19 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
+<script type="text/html" id="plannerListDialog">
+ <div class="layui-form admin-form">
+ <div class="model-form" style="padding: 30px">
+ <div id="plannerXmlSel"></div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right" style="padding-right: 30px">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </div>
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
--
Gitblit v1.9.1