zy-crm.git - Gitblit

parent: 94defeef | 补丁 | 提交 | ignore whitespace

LSH

2023-10-06 1dcf237ac9fca4a6132b0175c188c44308e7a4f7

5个文件已修改

	src/main/java/com/zy/crm/common/web/BaseController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/crm/manager/controller/CstmrController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/crm/manager/controller/DashboardController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/cstmr/cstmr.html	61 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/home/dashboard.html	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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();
    }

 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();

 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);
    }

}

 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">

 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>

			@@ -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();
			}

			@@ -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();

			@@ -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);
			}

			}

			@@ -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">

			@@ -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>