From 1dcf237ac9fca4a6132b0175c188c44308e7a4f7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 06 十月 2023 08:32:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/web/BaseController.java | 13 ++++
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 1
src/main/webapp/views/cstmr/cstmr.html | 61 ++++++++++----------
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 13 ++++
src/main/webapp/views/home/dashboard.html | 37 +++++++++++
5 files changed, 93 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/web/BaseController.java b/src/main/java/com/zy/crm/common/web/BaseController.java
index 6216688..8855433 100644
--- a/src/main/java/com/zy/crm/common/web/BaseController.java
+++ b/src/main/java/com/zy/crm/common/web/BaseController.java
@@ -80,6 +80,11 @@
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
}
+ protected Long getUserId(String token){
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
+ return userLogin.getUserId();
+ }
+
protected User getUser(){
User user = userService.selectById(getUserId());
if (null == user) {
@@ -88,6 +93,14 @@
return user;
}
+ protected User getUser(String token){
+ User user = userService.selectById(getUserId(token));
+ if (null == user) {
+ throw new CoolException(BaseRes.DENIED);
+ }
+ return user;
+ }
+
protected Long getDeptId() {
return getUser().getDeptId();
}
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 8694fa1..b26ea1f 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -135,6 +135,7 @@
cstmr.setCreateTime(new Date());
cstmr.setUpdateBy(getUserId());
cstmr.setUpdateTime(new Date());
+ cstmr.setDirector(getUserId());
cstmr.setStatus(1);
cstmrService.insert(cstmr);
return R.ok();
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 8d418b6..599402d 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -1,12 +1,15 @@
package com.zy.crm.manager.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.CompanyTarget;
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CompanyTargetService;
import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -131,4 +134,14 @@
return R.ok().add(list);
}
+ @RequestMapping("/dashboard/popup/auth")
+ public R popup(String token) {
+ String item = "false";
+ User user = getUser(token);
+ if (user.getRoleId()<3){
+ item="true";
+ }
+ return R.ok(item);
+ }
+
}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 6a90a05..1764881 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -191,6 +191,24 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍖哄垎: </label>
+ <div class="layui-input-block">
+ <select name="type" lay-vertype="tips" lay-verify="required">
+ <option value="">璇烽�夋嫨鍖哄垎</option>
+ <option value="1">鍐呴攢</option>
+ <option value="2">澶栭攢</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹㈡埛鍏崇郴: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="rela" placeholder="璇疯緭鍏ュ鎴峰叧绯�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐪佸競鍖� : </label>
<div class="layui-input-block">
<input id="cascaderVal" name="pcd" placeholder="璇烽�夋嫨" class="layui-hide" lay-verify="required"/>
@@ -208,42 +226,25 @@
<input class="layui-input" name="contacts" placeholder="璇疯緭鍏ュ鎴疯仈绯讳汉" autocomplete="off" lay-verify="required">
</div>
</div>
- </div>
- <div class="layui-col-md6">
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">瀹㈡埛鍏崇郴: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="rela" placeholder="璇疯緭鍏ュ鎴峰叧绯�" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍖哄垎: </label>
- <div class="layui-input-block">
- <select name="type" lay-vertype="tips" lay-verify="required">
- <option value="">璇烽�夋嫨鍖哄垎</option>
- <option value="1">鍐呴攢</option>
- <option value="2">澶栭攢</option>
- </select>
- </div>
- </div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐢佃瘽: </label>
<div class="layui-input-block">
<input class="layui-input" name="tel" placeholder="璇疯緭鍏ョ數璇�" autocomplete="off" lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璐熻矗浜�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="director" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" style="display: none" lay-verify="required">
- <input id="director$" name="director$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">璐熻矗浜�: </label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="director" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" style="display: none" lay-verify="required">-->
+<!-- <input id="director$" name="director$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 68d2952..6ab08f4 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -48,7 +48,7 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-xs12 layui-col-md8" >
- <div class="layui-card" style="">
+ <div class="layui-card" style="" id="popup">
<div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
<div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
<div class="layui-row">
@@ -78,7 +78,7 @@
</div>
</div>
</div>
- <div class="layui-card" style="background-color: #ffffff">
+ <div class="layui-card" style="background-color: #ffffff" id="popupMan">
<div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">瀹炴椂閿�鍞儏鍐�</div>
<div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
<div class="layui-row">
@@ -248,6 +248,24 @@
</div>
+
+<script>
+ // 鏄剧ず鍥㈤槦鏁版嵁
+ function showPopup(res) {
+ if (res==="true"){
+ document.getElementById('popup').style.display = 'block';
+ }else {
+ // 闅愯棌鍥㈤槦鏁版嵁
+ document.getElementById('popup').style.display = 'none';
+ document.getElementById('popupMan').style.width = '100%';
+ }
+ }
+ // 闅愯棌鍥㈤槦鏁版嵁
+ function hidePopup() {
+ document.getElementById('popup').style.display = 'none';
+ }
+</script>
+
<!-- js閮ㄥ垎 -->
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
@@ -255,6 +273,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script>
+ f()
layui.use(['layer', 'element'], function () {
var $ = layui.jquery;
var layer = layui.layer;
@@ -496,6 +515,20 @@
});
});
+
+ function f() {
+ let token = localStorage.getItem("token");
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/popup/auth",
+ data:{token : token},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ showPopup(res.msg)
+ }
+ }
+ })
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1