From 49ab626b5cb89219a4b4b86b5f1774f4705df51c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:46:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CustomerIndustryController.java    |  159 ++++++++++++
 src/main/java/com/zy/crm/manager/service/impl/CustomerIndustryServiceImpl.java |   12 
 src/main/webapp/views/customerIndustry/customerIndustry.html                   |   99 +++++++
 src/main/webapp/views/cstmr/cstmr.html                                         |   17 
 src/main/java/com/zy/crm/manager/entity/CustomerIndustry.java                  |  151 +++++++++++
 src/main/java/com/zy/crm/manager/mapper/CustomerIndustryMapper.java            |   12 
 src/main/webapp/static/js/customerIndustry/customerIndustry.js                 |  257 +++++++++++++++++++
 src/main/resources/mapper/CustomerIndustryMapper.xml                           |   18 +
 src/main/java/com/zy/crm/manager/service/CustomerIndustryService.java          |    8 
 src/main/webapp/views/cstmr/cstmr2.html                                        |   17 
 10 files changed, 732 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CustomerIndustryController.java b/src/main/java/com/zy/crm/manager/controller/CustomerIndustryController.java
new file mode 100644
index 0000000..69d9ee1
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/CustomerIndustryController.java
@@ -0,0 +1,159 @@
+package com.zy.crm.manager.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.crm.manager.entity.CustomerIndustry;
+import com.zy.crm.manager.service.CustomerIndustryService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.domain.KeyValueVo;
+import com.zy.crm.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class CustomerIndustryController extends BaseController {
+
+    @Autowired
+    private CustomerIndustryService customerIndustryService;
+
+    @RequestMapping(value = "/customerIndustry/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(customerIndustryService.selectById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/customerIndustry/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<CustomerIndustry> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        allLike(CustomerIndustry.class, param.keySet(), wrapper, condition);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(customerIndustryService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
+    @RequestMapping(value = "/customerIndustry/add/auth")
+    @ManagerAuth
+    public R add(CustomerIndustry customerIndustry) {
+        Date now = new Date();
+        customerIndustry.setCreateBy(getUserId());
+        customerIndustry.setCreateTime(now);
+        customerIndustry.setUpdateBy(getUserId());
+        customerIndustry.setUpdateTime(now);
+        customerIndustryService.insert(customerIndustry);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/customerIndustry/update/auth")
+	@ManagerAuth
+    public R update(CustomerIndustry customerIndustry){
+        if (Cools.isEmpty(customerIndustry) || null==customerIndustry.getId()){
+            return R.error();
+        }
+        Date now = new Date();
+        customerIndustry.setUpdateBy(getUserId());
+        customerIndustry.setUpdateTime(now);
+        customerIndustryService.updateById(customerIndustry);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/customerIndustry/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            customerIndustryService.deleteById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/customerIndustry/export/auth")
+    @ManagerAuth
+    public R export(@RequestBody JSONObject param){
+        EntityWrapper<CustomerIndustry> wrapper = new EntityWrapper<>();
+        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+        Map<String, Object> map = excludeTrash(param.getJSONObject("customerIndustry"));
+        convert(map, wrapper);
+        List<CustomerIndustry> list = customerIndustryService.selectList(wrapper);
+        return R.ok(exportSupport(list, fields));
+    }
+
+    @RequestMapping(value = "/customerIndustryQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        EntityWrapper<CustomerIndustry> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<CustomerIndustry> page = customerIndustryService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (CustomerIndustry customerIndustry : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", customerIndustry.getId());
+            map.put("value", customerIndustry.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/customerIndustryNameQuery/auth")
+    @ManagerAuth
+    public R queryName(String condition) {
+        EntityWrapper<CustomerIndustry> wrapper = new EntityWrapper<>();
+        wrapper.like("id", condition);
+        Page<CustomerIndustry> page = customerIndustryService.selectPage(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (CustomerIndustry customerIndustry : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", customerIndustry.getName());
+            map.put("value", customerIndustry.getName());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "/customerIndustry/check/column/auth")
+    @ManagerAuth
+    public R query(@RequestBody JSONObject param) {
+        Wrapper<CustomerIndustry> wrapper = new EntityWrapper<CustomerIndustry>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+        if (null != customerIndustryService.selectOne(wrapper)){
+            return R.parse(BaseRes.REPEAT).add(getComment(CustomerIndustry.class, String.valueOf(param.get("key"))));
+        }
+        return R.ok();
+    }
+
+    @RequestMapping("/customerIndustry/all/get/kv")
+    @ManagerAuth
+    public R getDataKV(@RequestParam(required = false) String condition) {
+        List<KeyValueVo> vos = new ArrayList<>();
+        Wrapper<CustomerIndustry> wrapper = new EntityWrapper<CustomerIndustry>().andNew().like("id", condition).orderBy("create_time", false);
+        customerIndustryService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+        return R.ok().add(vos);
+    }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/CustomerIndustry.java b/src/main/java/com/zy/crm/manager/entity/CustomerIndustry.java
new file mode 100644
index 0000000..60517f8
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/CustomerIndustry.java
@@ -0,0 +1,151 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_customer_industry")
+public class CustomerIndustry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 琛屼笟
+     */
+    @ApiModelProperty(value= "琛屼笟")
+    private String name;
+
+    /**
+     * 鐘舵�� 1: 姝e父  0: 绂佺敤  
+     */
+    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
+    private Integer status;
+
+    /**
+     * 娣诲姞浜哄憳
+     */
+    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    @TableField("create_by")
+    private Long createBy;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("create_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("update_by")
+    private Long updateBy;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @TableField("update_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    public CustomerIndustry() {}
+
+    public CustomerIndustry(String name,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+        this.name = name;
+        this.status = status;
+        this.createBy = createBy;
+        this.createTime = createTime;
+        this.updateBy = updateBy;
+        this.updateTime = updateTime;
+        this.memo = memo;
+    }
+
+//    CustomerIndustry customerIndustry = new CustomerIndustry(
+//            null,    // 琛屼笟[闈炵┖]
+//            null,    // 鐘舵��
+//            null,    // 娣诲姞浜哄憳
+//            null,    // 娣诲姞鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null,    // 淇敼鏃堕棿
+//            null    // 澶囨敞
+//    );
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return "姝e父";
+            case 0:
+                return "绂佺敤";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getCreateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.createBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getUpdateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.updateBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getUpdateTime$(){
+        if (Cools.isEmpty(this.updateTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+    }
+
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/CustomerIndustryMapper.java b/src/main/java/com/zy/crm/manager/mapper/CustomerIndustryMapper.java
new file mode 100644
index 0000000..7e1242b
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/CustomerIndustryMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.zy.crm.manager.entity.CustomerIndustry;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CustomerIndustryMapper extends BaseMapper<CustomerIndustry> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/CustomerIndustryService.java b/src/main/java/com/zy/crm/manager/service/CustomerIndustryService.java
new file mode 100644
index 0000000..ba09aae
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/CustomerIndustryService.java
@@ -0,0 +1,8 @@
+package com.zy.crm.manager.service;
+
+import com.zy.crm.manager.entity.CustomerIndustry;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface CustomerIndustryService extends IService<CustomerIndustry> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CustomerIndustryServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CustomerIndustryServiceImpl.java
new file mode 100644
index 0000000..06c37a4
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/CustomerIndustryServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.zy.crm.manager.mapper.CustomerIndustryMapper;
+import com.zy.crm.manager.entity.CustomerIndustry;
+import com.zy.crm.manager.service.CustomerIndustryService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("customerIndustryService")
+public class CustomerIndustryServiceImpl extends ServiceImpl<CustomerIndustryMapper, CustomerIndustry> implements CustomerIndustryService {
+
+}
diff --git a/src/main/resources/mapper/CustomerIndustryMapper.xml b/src/main/resources/mapper/CustomerIndustryMapper.xml
new file mode 100644
index 0000000..d559289
--- /dev/null
+++ b/src/main/resources/mapper/CustomerIndustryMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.CustomerIndustryMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.CustomerIndustry">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="memo" property="memo" />
+
+    </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/customerIndustry/customerIndustry.js b/src/main/webapp/static/js/customerIndustry/customerIndustry.js
new file mode 100644
index 0000000..1cb1506
--- /dev/null
+++ b/src/main/webapp/static/js/customerIndustry/customerIndustry.js
@@ -0,0 +1,257 @@
+var pageCurr;
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#customerIndustry',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/customerIndustry/list/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            // {type: 'checkbox'},
+            {field: 'id', align: 'center',title: 'ID',hide :false}
+            ,{field: 'name', align: 'center',title: '琛屼笟',hide :false}
+            ,{field: 'status$', align: 'center',title: '鐘舵��',hide :true}
+            ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',hide :true}
+            ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide :true}
+            ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide :false}
+            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿',hide :false}
+            ,{field: 'memo', align: 'center',title: '澶囨敞',hide :false}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        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(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(customerIndustry)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(customerIndustry)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'customerIndustry': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/customerIndustry/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(customerIndustry)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                layDateRender(mData);
+                form.val('detail', mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/customerIndustry/"+(mData?'update':'add')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/customerIndustry/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '#createTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['createTime\\$']:null
+            });
+            layDate.render({
+                elem: '#updateTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['updateTime\\$']:null
+            });
+
+        }, 300);
+    }
+    layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    tableIns.reload({
+        where: searchData,
+        page: {curr: pageCurr}
+     });
+}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 4c4ce6f..cf4122b 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -167,15 +167,14 @@
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">瀹㈡埛琛屼笟: </label>
-                    <div class="layui-input-block">
-                        <select name="industry" lay-vertype="tips" lay-verify="required">
-                            <option value="">璇烽�夋嫨琛屼笟</option>
-                            <option value="鍖昏嵂涓�">鍖昏嵂涓�</option>
-                            <option value="鍒堕�犱笟">鍒堕�犱笟</option>
-                            <option value="绾虹粐涓�">绾虹粐涓�</option>
-                            <option value="浠撳偍涓�">浠撳偍涓�</option>
-                            <option value="鍐滀笟">鍐滀笟</option>
-                        </select>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input class="layui-input" name="industry" placeholder="璇疯緭鍏ュ鎴疯涓�" style="display: none">
+                        <input id="industry" name="industry" 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="customerIndustryNameQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="customerIndustryNameQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/webapp/views/cstmr/cstmr2.html b/src/main/webapp/views/cstmr/cstmr2.html
index 2e1cd2f..4226368 100644
--- a/src/main/webapp/views/cstmr/cstmr2.html
+++ b/src/main/webapp/views/cstmr/cstmr2.html
@@ -180,15 +180,14 @@
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">瀹㈡埛琛屼笟: </label>
-                    <div class="layui-input-block">
-                        <select name="industry" lay-vertype="tips" lay-verify="required">
-                            <option value="">璇烽�夋嫨琛屼笟</option>
-                            <option value="鍖昏嵂涓�">鍖昏嵂涓�</option>
-                            <option value="鍒堕�犱笟">鍒堕�犱笟</option>
-                            <option value="绾虹粐涓�">绾虹粐涓�</option>
-                            <option value="浠撳偍涓�">浠撳偍涓�</option>
-                            <option value="鍐滀笟">鍐滀笟</option>
-                        </select>
+                    <div class="layui-input-block cool-auto-complete">
+                        <input class="layui-input" name="industry" placeholder="璇疯緭鍏ュ鎴疯涓�" style="display: none">
+                        <input id="industry" name="industry" 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="customerIndustryNameQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                            <select class="cool-auto-complete-window-select" data-key="customerIndustryNameQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                            </select>
+                        </div>
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/webapp/views/customerIndustry/customerIndustry.html b/src/main/webapp/views/customerIndustry/customerIndustry.html
new file mode 100644
index 0000000..ad3ed8b
--- /dev/null
+++ b/src/main/webapp/views/customerIndustry/customerIndustry.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">缂栧彿:</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="customerIndustry" lay-filter="customerIndustry"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+    </div>
+</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>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/customerIndustry/customerIndustry.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">琛屼笟: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="name" placeholder="璇疯緭鍏ヨ涓�" lay-vertype="tips" lay-verify="required">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐘舵��: </label>
+                    <div class="layui-input-block">
+                        <select name="status">
+                            <option value="">璇烽�夋嫨鐘舵��</option>
+                            <option value="1">姝e父</option>
+                            <option value="0">绂佺敤</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">澶囨敞: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+</html>
+

--
Gitblit v1.9.1