中扬CRM客户关系管理系统
LSH
2024-03-29 86586ac59fef9b677deaf15136e1f44d3d2204be
#周计划
8个文件已修改
234 ■■■■■ 已修改文件
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyDailyPlanMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyDailyRealityMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/cstmr/cstmr.js 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/weekly/weekly.js 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/cstmr/cstmr.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/weekly/weekly.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
@@ -200,6 +200,36 @@
    @ApiModelProperty(value= "备注")
    private String memo;
    /**
     * 省
     */
    @ApiModelProperty(value= "省")
    private String province;
    /**
     * 市
     */
    @ApiModelProperty(value= "市")
    private String city;
    /**
     * 县
     */
    @ApiModelProperty(value= "县")
    private String district;
    /**
     * 镇
     */
    @ApiModelProperty(value= "镇")
    private String town;
    /**
     * 详细地址
     */
    @ApiModelProperty(value= "详细地址")
    private String addr;
    public WeeklyDailyPlan() {}
    public WeeklyDailyPlan(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Long weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
@@ -151,6 +151,36 @@
    private String weeklyMatter;
    /**
     * 省
     */
    @ApiModelProperty(value= "省")
    private String province;
    /**
     * 市
     */
    @ApiModelProperty(value= "市")
    private String city;
    /**
     * 县
     */
    @ApiModelProperty(value= "县")
    private String district;
    /**
     * 镇
     */
    @ApiModelProperty(value= "镇")
    private String town;
    /**
     * 详细地址
     */
    @ApiModelProperty(value= "详细地址")
    private String addr;
    /**
     * 负责人
     */
    @ApiModelProperty(value= "负责人")
src/main/resources/mapper/WeeklyDailyPlanMapper.xml
@@ -27,6 +27,11 @@
        <result column="cstmr_id" property="cstmrId" />
        <result column="weekly_day" property="weeklyDay" />
        <result column="memo" property="memo" />
        <result column="province" property="province" />
        <result column="city" property="city" />
        <result column="district" property="district" />
        <result column="town" property="town" />
        <result column="addr" property="addr" />
    </resultMap>
src/main/resources/mapper/WeeklyDailyRealityMapper.xml
@@ -27,6 +27,11 @@
        <result column="cstmr_id" property="cstmrId" />
        <result column="weekly_day" property="weeklyDay" />
        <result column="memo" property="memo" />
        <result column="province" property="province" />
        <result column="city" property="city" />
        <result column="district" property="district" />
        <result column="town" property="town" />
        <result column="addr" property="addr" />
    </resultMap>
src/main/webapp/static/js/cstmr/cstmr.js
@@ -146,6 +146,7 @@
            ,{field: 'uuid', align: 'left',title: '客户代号', hide: false}
            ,{field: 'addr', align: 'left',title: '详细地址', hide: false, templet:function(d){return emptyShow(d.addr)}}
            ,{field: 'tel', align: 'left',title: '电话', hide: false, templet:function(d){return emptyShow(d.tel)}}
            ,{field: 'weeklyDailyReality', align: 'center',title: '日行程',hide : false, toolbar: '#tbLookReality'}
            ,{field: 'remarks', align: 'left',title: '备注', hide: false, templet:function(d){return emptyShow(d.remarks)}}
            ,{field: 'cstmrType$', align: 'left',title: '客户类别', hide: false}
            ,{field: 'industry', align: 'left',title: '客户行业', hide: false}
@@ -256,6 +257,69 @@
            case "del":
                del([data.id]);
                break;
            case "lookReality":
                var $a = $(obj.tr).find('a[lay-event="lookReality"]');
                var offset = $a.offset();
                var top2 = offset.top;
                var left = offset.left;
                layer.open({
                    type: 1,
                    title: false,
                    area: '1100px',
                    offset: [top2 + 'px', (left - 830 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
                    fixed: false,
                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                    success: function (layero) {
                        table.render({
                            elem: '#lookSSXMTable',
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/weeklyDailyReality/list/auth',
                            where: {
                                cstmr_id: data.id
                            },
                            page: true,
                            cellMinWidth: 100,
                            cols: [[
                                {type: 'numbers'}
                                // ,{field: 'weeklyDay$', align: 'center',title: '星期'}
                                ,{field: 'dailyTime$', align: 'center',title: '日期'}
                                ,{field: 'workContent', align: 'center', title: '工作内容', edit:false}
                                ,{field: 'workPurpose', title: '工作目的', edit:false}
                                ,{field: 'comment', title: '评论', edit:false}
                                ,{field: 'weeklyMatter', title: '需协助事项',  edit:false}
                                // ,{field: 'dailyTime$', align: 'center',title: '日报日期'}
                                // ,{field: 'settleMsg', align: 'center',title: '审核进度'}
                                ,{field: 'director', align: 'center',title: '负责人'}
                                // ,{field: 'settleSize', align: 'center',title: '流程长度'}
                                // ,{field: 'settleCurrent', align: 'center',title: '当前进度'}
                                // ,{field: 'cstmrId', align: 'center',title: '甲方单位ID'}//, templet: function () { return htmlCstme;}
                                ,{field: 'memo', align: 'center',title: '备注',   edit:false}
                            ]],
                            request: {
                                pageName: 'curr',
                                pageSize: 'limit'
                            },
                            parseData: function (res) {
                                return {
                                    'code': res.code,
                                    'msg': res.msg,
                                    'count': res.data.total,
                                    'data': res.data.records
                                }
                            },
                            response: {
                                statusCode: 200
                            },
                            done: function () {
                                $(layero).find('.layui-table-view').css('margin', '0');
                            },
                            size: ''
                        });
                    }
                });
                break;
        }
    });
src/main/webapp/static/js/weekly/weekly.js
@@ -3,6 +3,8 @@
var treeCond;
var htmlCstme;
var htmlCstmrData;
var indexS = "9999,8888";
var indexDelSign = 0;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -363,17 +365,18 @@
                            cols: [[
                                {type: 'numbers'}
                                ,{field: 'weeklyDay$', align: 'center',title: '星期'}
                                ,{field: 'workContent', title: '工作内容', edit:true}
                                ,{field: 'workPurpose', title: '工作目的', edit:true}
                                ,{field: 'comment', title: '评论', edit:true}
                                ,{field: 'weeklyMatter', title: '需协助事项',  edit:true}
                                ,{field: 'dailyTime$', align: 'center',title: '日期'}
                                ,{field: 'workContent', align: 'center', title: '工作内容', edit:false}
                                ,{field: 'workPurpose', title: '工作目的', edit:false}
                                ,{field: 'comment', title: '评论', edit:false}
                                ,{field: 'weeklyMatter', title: '需协助事项',  edit:false}
                                // ,{field: 'dailyTime$', align: 'center',title: '日报日期'}
                                // ,{field: 'settleMsg', align: 'center',title: '审核进度'}
                                // ,{field: 'director', align: 'center',title: '负责人'}
                                // ,{field: 'settleSize', align: 'center',title: '流程长度'}
                                // ,{field: 'settleCurrent', align: 'center',title: '当前进度'}
                                ,{field: 'cstmrId', align: 'center',title: '甲方单位ID',   templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
                                ,{field: 'memo', align: 'center',title: '备注',   edit:true}
                                ,{field: 'cstmrId', align: 'center',title: '甲方单位ID'}//, templet: function () { return htmlCstme;}
                                ,{field: 'memo', align: 'center',title: '备注',   edit:false}
                            ]],
                            request: {
                                pageName: 'curr',
@@ -425,17 +428,18 @@
                            cols: [[
                                {type: 'numbers'}
                                ,{field: 'weeklyDay$', align: 'center',title: '星期'}
                                ,{field: 'workContent', align: 'center', title: '工作内容', edit:true}
                                ,{field: 'workPurpose', title: '工作目的', edit:true}
                                ,{field: 'comment', title: '评论', edit:true}
                                ,{field: 'weeklyMatter', title: '需协助事项',  edit:true}
                                ,{field: 'dailyTime$', align: 'center',title: '日期'}
                                ,{field: 'workContent', align: 'center', title: '工作内容', edit:false}
                                ,{field: 'workPurpose', title: '工作目的', edit:false}
                                ,{field: 'comment', title: '评论', edit:false}
                                ,{field: 'weeklyMatter', title: '需协助事项',  edit:false}
                                // ,{field: 'dailyTime$', align: 'center',title: '日报日期'}
                                // ,{field: 'settleMsg', align: 'center',title: '审核进度'}
                                // ,{field: 'director', align: 'center',title: '负责人'}
                                // ,{field: 'settleSize', align: 'center',title: '流程长度'}
                                // ,{field: 'settleCurrent', align: 'center',title: '当前进度'}
                                ,{field: 'cstmrId', align: 'center',title: '甲方单位ID',   templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
                                ,{field: 'memo', align: 'center',title: '备注',   edit:true}
                                ,{field: 'cstmrId', align: 'center',title: '甲方单位ID'}//, templet: function () { return htmlCstme;}
                                ,{field: 'memo', align: 'center',title: '备注',   edit:false}
                            ]],
                            request: {
                                pageName: 'curr',
@@ -568,12 +572,67 @@
                        $(".layui-table-cell").css('overflow', 'visible');//解决layui数据表格中嵌套下拉框显示问题
                        $(layero).find('.layui-table-view').css('margin', '0');
                        var options = this;
                        var indexSign = 0;
                        // 获取当前行数据
                        table.getRowData = function(elem){
                            var index = $(elem).closest('tr').data('index');
                            console.log("index-----")
                            console.log(index)
                            var indexArray = indexS.split(","); // 将字符串拆分为数组
                            // 遍历数组中的每个元素
                            for (var i = 0; i < indexArray.length; i++) {
                                var element = Number(indexArray[i]);
                                // 进行相应的操作
                                console.log("element-----");
                                console.log(element);
                                if (element===index){
                                    indexSign = 1;
                                }
                            }
                            if (indexSign === 0){
                                indexS = indexS+","+index;
                                console.log("indexS-----")
                                console.log(indexS)
                            }
                            return table.cache[options.id][index] || {};
                        };
                        if (indexSign === 0 && indexDelSign === 0){
                            console.log("渲染")
                            // 渲染搜索模板
                            $.ajax({
                                url: baseUrl+"/cstmr/all/get/kv",
                                headers: {'token': localStorage.getItem('token')},
                                data: {
                                    limit: 9999
                                },
                                method: 'POST',
                                // async: false, // 设置为同步执行
                                success: function (res) {
                                    console.log(res)
                                    console.log($("#cstmrId").html())
                                    res.data.forEach((item) => {
                                        $("#cstmrId").append("<option value='" + item.value + "'>" + item.name + "</option>")
                                    })
                                    // htmlCstme = "<select id=\"select_cstmr\" name=\"select_cstmr\" lay-vertype=\"tips\" lay-verify=\"required\" required=\"\">"
                                    // htmlCstme = htmlCstme +
                                    //     "                    <option style=\"display: none\"></option>\n"
                                    // if (res.code === 200){
                                    //     for (var val in res.data) {
                                    //         var cstmrVal = res.data[val]
                                    //         console.log(cstmrVal)
                                    //         htmlCstme = htmlCstme +
                                    //             "        <option value = \""+cstmrVal.value+"\"+\n" +
                                    //             "        > "+cstmrVal.name+" </option>\n"
                                    //     }
                                    // } else {
                                    //     htmlCstme = htmlCstme +
                                    //         "<option value=\"0\">异常</option>"
                                    // }
                                    // htmlCstme = htmlCstme +  "\n" + " </select>";
                                }
                            })
                        }
                        $('.select-cstmr').on('change', function(){
                            console.log("cstmrId")
@@ -687,6 +746,9 @@
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            if (!exp){
                                indexDelSign = 1;
                            }
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
src/main/webapp/views/cstmr/cstmr.html
@@ -115,6 +115,15 @@
    </div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="tbLookReality">
    <span class="layui-text">
        <a href="javascript:;" lay-event="lookReality">
            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 查看日行程
        </a>
    </span>
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
src/main/webapp/views/weekly/weekly.html
@@ -209,8 +209,7 @@
<script type="text/template" id="cstmrId">
    <select id="select-cstmr" style="width: 100%" class="layui-border select-cstmr" lay-ignore >
        <option value="1">仓储</option>
        <option value="0">代采</option>
            <option value="">选择甲方单位</option>
    </select>
</script>