#

LSH

2023-12-01 6702e8cd7fca6725c0cd35613ceefef7f812c90e

#

 src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java

@@ -119,6 +119,22 @@
        return R.ok(result);
    }

    @RequestMapping(value = "/orderProductTypeSQuery/auth")
    @ManagerAuth
    public R queryS(String condition) {
        EntityWrapper<OrderProductType> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition);
        Page<OrderProductType> page = orderProductTypeService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (OrderProductType orderProductType : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", orderProductType.getName());
            map.put("value", orderProductType.getName());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/orderProductType/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {

 src/main/java/com/zy/crm/manager/entity/Cstmr.java

@@ -212,13 +212,6 @@
    private String productCategory;

    /**
     * 产品类型
     */
    @ApiModelProperty(value= "产品类型")
    @TableField("order_product_type_id")
    private Long orderProductTypeId;

    /**
     * 企业信用代码
     */
    @ApiModelProperty(value= "企业信用代码")
@@ -382,17 +375,6 @@
        }
        return null;
    }

    public String getOrderProductTypeId$(){
        if (this.orderProductTypeId==null) return null;
        OrderProductTypeService orderProductTypeService = SpringUtils.getBean(OrderProductTypeService.class);
        OrderProductType orderProductType = orderProductTypeService.selectById(this.orderProductTypeId);
        if (!Cools.isEmpty(orderProductType)){
            return String.valueOf(orderProductType.getName());
        }
        return null;
    }


    public void setType0(String type0){
        if (Cools.isEmpty(type0)) {

 src/main/resources/mapper/CstmrMapper.xml

@@ -32,7 +32,6 @@
        <result column="memo" property="memo" />
        <result column="industry" property="industry" />
        <result column="product_category" property="productCategory" />
        <result column="order_product_type_id" property="orderProductTypeId" />
        <result column="credit_code" property="creditCode" />
        <result column="issue_time" property="issueTime" />
        <result column="company_type" property="companyType" />

 src/main/webapp/static/js/cstmr/cstmr.js

@@ -149,7 +149,7 @@
            ,{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}
            ,{field: 'orderProductTypeId$', align: 'left',title: '产品类型', hide: false}
            ,{field: 'productCategory', align: 'left',title: '产品类型', hide: false}
            ,{field: 'userId$', align: 'left',title: '添加人员', hide: true}
            ,{field: 'deptId$', align: 'left',title: '所属部门', hide: true}
            ,{field: 'rela', align: 'left',title: '客户关系', hide: true}

 src/main/webapp/static/js/cstmr/cstmr2.js

@@ -149,7 +149,7 @@
            ,{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}
            ,{field: 'orderProductTypeId$', align: 'left',title: '产品类型', hide: false}
            ,{field: 'productCategory', align: 'left',title: '产品类型', hide: false}
            ,{field: 'userId$', align: 'left',title: '添加人员', hide: true}
            ,{field: 'createTime$', align: 'left',title: '添加时间', hide: false}
            ,{field: 'deptId$', align: 'left',title: '所属部门', hide: true}

 src/main/webapp/views/cstmr/cstmr.html

@@ -181,11 +181,11 @@
                <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="orderProductTypeId" placeholder="请输入产品类型" style="display: none">
                        <input class="layui-input" name="productCategory" placeholder="请输入产品类型" style="display: none">
                        <input id="orderProductTypeId$" name="orderProductTypeId$" 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="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            <input class="cool-auto-complete-window-input" data-key="orderProductTypeSQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeSQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>

 src/main/webapp/views/cstmr/cstmr2.html

@@ -194,11 +194,11 @@
                <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="orderProductTypeId" placeholder="请输入产品类型" style="display: none">
                        <input class="layui-input" name="productCategory" placeholder="请输入产品类型" style="display: none">
                        <input id="orderProductTypeId$" name="orderProductTypeId$" 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="orderProductTypeQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            <input class="cool-auto-complete-window-input" data-key="orderProductTypeSQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="orderProductTypeSQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>

 src/main/webapp/views/cstmr/cstmr_more.html

@@ -140,7 +140,7 @@
                            <div class="layui-inline layui-col-md6">
                                <label class="layui-form-label">产品类别:</label>
                                <div class="layui-input-block">
                                    <input name="orderProductTypeId$" class="layui-input" disabled />
                                    <input name="productCategory" class="layui-input" disabled />
                                </div>
                            </div>
                            <div class="layui-inline layui-col-md12">