#

luxiaotao1123

2022-11-08 bb80791c3d96ba2bf19c29ede1ae87905bceb7ba

#

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

@@ -9,9 +9,11 @@
import com.zy.crm.manager.service.CompanyService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.DicService;
import com.zy.crm.system.service.HostService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -327,5 +329,80 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    @TableField(exist = false)
    private String pcd;

    public String getPcd() {
        StringBuilder sb = new StringBuilder();
        if (!Cools.isEmpty(province)) {
            sb.append(province).append(",");
        }
        if (!Cools.isEmpty(city)) {
            sb.append(city).append(",");
        }
        if (!Cools.isEmpty(district)) {
            sb.append(district).append(",");
        }
        String s = sb.toString();
        if (s.endsWith(",")) {
            s = s.substring(0, s.length() - 1);
        }
        return s;
    }

    public String getPcd$() {
        StringBuilder sb = new StringBuilder();
        DicService service = SpringUtils.getBean(DicService.class);
        if (!Cools.isEmpty(province)) {
            Dic provinceDic = service.selectById(province);
            if (!Cools.isEmpty(provinceDic)) {
                sb.append(provinceDic.getName()).append(",");
            }
        }
        if (!Cools.isEmpty(city)) {
            Dic cityDic = service.selectById(city);
            if (!Cools.isEmpty(cityDic)) {
                sb.append(cityDic.getName()).append(",");
            }
        }
        if (!Cools.isEmpty(district)) {
            Dic districtDic = service.selectById(district);
            if (!Cools.isEmpty(districtDic)) {
                sb.append(districtDic.getName()).append(",");
            }
        }
        String s = sb.toString();
        if (s.endsWith(",")) {
            s = s.substring(0, s.length() - 1);
        }
        return s;
    }

    public void setPcd(String pcd) {
        this.pcd = pcd;
        if (!Cools.isEmpty(pcd)) {
            String[] split = this.pcd.split(",");
            for (int i = 0;i< split.length; i++) {
                switch (i) {
                    case 0:
                        this.province = split[0];
                        break;
                    case 1:
                        this.city = split[1];
                        break;
                    case 2:
                        this.district = split[2];
                        break;
                    default:
                        break;
                }
            }
        } else {
            this.province = "";
            this.city = "";
            this.district = "";
        }
    }


}

 src/main/webapp/static/js/order/order.js

@@ -246,11 +246,15 @@
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            area: '1500px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                if (mData) {
                    $('#cascaderVal').val(mData.pcd);
                }
                layDateRender(mData);
                cascaderRender();
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);

 src/main/webapp/views/order/order.html

@@ -113,95 +113,71 @@
    <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">所属商户: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="hostId" placeholder="请输入所属商户" style="display: none">
                        <input id="hostId$" name="hostId$" 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="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" 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 cool-auto-complete">
                        <input class="layui-input" name="deptId" placeholder="请输入所属部门" style="display: none">
                        <input id="deptId$" name="deptId$" 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="deptQueryBydeptId" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="deptQueryBydeptIdSelect" 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 cool-auto-complete">
                        <input class="layui-input" name="userId" placeholder="请输入所属人员" style="display: none">
                        <input id="userId$" name="userId$" 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="userQueryByuserId" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryByuserIdSelect" 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 cool-auto-complete">
                        <input class="layui-input" name="cstmrId" placeholder="请输入甲方单位" style="display: none">
                        <input id="cstmrId$" name="cstmrId$" 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="cstmrQueryBycstmrId" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="cstmrQueryBycstmrIdSelect" 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">
                        <input class="layui-input" name="uuid" placeholder="请输入客户代号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
            <div class="layui-col-md6">
                <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">
                        <input class="layui-input" name="name" placeholder="请输入客户名称" lay-vertype="tips" lay-verify="required" autocomplete="off">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">总金额: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="money" placeholder="请输入总金额">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">所属公司: </label>
                    <label class="layui-form-label layui-form-required">客户类别: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="company" placeholder="请输入所属公司" style="display: none">
                        <input id="company$" name="company$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入所属公司" onfocus=this.blur()>
                        <input class="layui-input" name="cstmrType" placeholder="请输入客户类别" lay-vertype="tips" lay-verify="required" style="display: none">
                        <input id="cstmrType$" name="cstmrType$" 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="companyQueryBycompany" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="companyQueryBycompanySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            <input class="cool-auto-complete-window-input" data-key="cstmrTypeQueryBycstmrType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="cstmrTypeQueryBycstmrTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <label class="layui-form-label layui-form-required">省市区 : </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="remarks" placeholder="请输入备注">
                        <input id="cascaderVal" name="pcd" placeholder="请选择" class="layui-hide" lay-verify="required"/>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">负责人: </label>
                    <label class="layui-form-label layui-form-required">详细地址: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="addr" 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">
                        <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">
                        <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'))">
@@ -211,95 +187,12 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">省: </label>
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="province" placeholder="请输入省">
                        <textarea class="layui-textarea" name="remarks" placeholder="请输入备注" maxlength="1024" autocomplete="off"></textarea>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">市: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="city" placeholder="请输入市">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">县: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="district" placeholder="请输入县">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">镇: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="town" placeholder="请输入镇">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">详细地址: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="addr" placeholder="请输入详细地址">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">附件: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="files" placeholder="请输入附件">
                    </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">正常</option>
                            <option value="0">禁用</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="createBy" placeholder="请输入添加人员" style="display: none">
                        <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" 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">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="updateBy" placeholder="请输入修改人员" style="display: none">
                        <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </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>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">