Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerInfo.html

@@ -1,9 +1,9 @@
<div class="layui-card">
    <div class="layui-card-header">
        <h2 class="header-title">合作商信息表</h2>
        <h2 class="header-title">合作商管理</h2>
        <span class="layui-breadcrumb pull-right">
          <a href="#!console">首页</a>
          <a><cite>合作商信息表</cite></a>
            <a href="#!console">首页</a>
            <a><cite>合作商管理</cite></a>
        </span>
    </div>

@@ -12,7 +12,15 @@
        <div class="layui-form toolbar">
            搜索：
            <input name="partnerName" id="partnerName-serch" placeholder="按合作商名称" type="text"
                   class="layui-input search-input" maxlength="50" autocomplete="off"/>&emsp;
                class="layui-input search-input" maxlength="50" />&emsp;
            <select id="province" placeholder="省份" lay-filter="province">
            </select>
            <select id="city" placeholder="市" lay-filter="city">
                <option value="">选择市</option>
            </select>
            <select id="area" placeholder="区县" lay-filter="areas">
                <option value="">选择区县</option>
            </select>
            <button id="partnerInfo-btn-search" class="layui-btn icon-btn permissions" permissions="partnerInfo-list"><i
                    class="layui-icon">&#xe615;</i>搜索
            </button>
@@ -22,8 +30,8 @@
        </div>

        <!-- 数据表格 -->
        <table class="layui-table permissions" permissions="equipmentDocking-list" id="partnerInfo-table"
               lay-filter="partnerInfo-table"></table>
        <table class="layui-table permissions" permissions="partnerInfo-list" id="partnerInfo-table"
            lay-filter="partnerInfo-table"></table>
    </div>
</div>

@@ -41,14 +49,14 @@
        <div class="layui-form-item">
            <label class="layui-form-label">合作商名称</label>
            <div class="layui-input-block">
                <input name="partnerName" lay-verify="required" required type="text" class="layui-input"/>
                <input name="partnerName" lay-verify="required" required type="text" class="layui-input" maxlength="50"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">合作商类型</label>
            <div class="layui-input-block">
                <input name="partnerType" id="partnerType" type="hidden" value="" />
                <select name="partnerTypeName" id="partnerTypeName" lay-filter="partnerTypeName"
                <!-- <input name="partnerTypeName" id="partnerTypeName" type="hidden" value=""/> -->
                <select name="partnerType" id="partnerType" lay-filter="partnerTypeName"
                        style="width: 50px;">
                    <option value="">请选择</option>
                    <option value="1">区域经销商</option>
@@ -70,61 +78,56 @@
                        </select></div>
                    <div class="layui-col-sm4">
                        <select id="partnerCity" lay-verify="required" required placeholder="市"
                                lay-filter="hospitalCity"
                                lay-filter="partnerCity"
                                style="width: 350px;">
                            <option value="">选择市</option>
                        </select></div>
                    <div class="layui-col-sm4">
                        <select id="partnerArea" lay-verify="required" required placeholder="区县"
                                lay-filter="hospitalArea"
                                lay-filter="partnerArea"
                                style="width: 350px;">
                            <option value="">选择区县</option>
                        </select>
                    </div>
                    <div class="layui-input-block">
                        <input name="partnerAdress" type="text" class="layui-input" maxlength="100"/>
                    </div>

                </div>

            </div>
        </div>
        <!--        <div class="layui-form-item">-->
        <!--            <label class="layui-form-label">地址</label>-->
        <!--            -->
        <!--        </div>-->
        <div class="layui-form-item">
<!--            <label class="layui-form-label">地址</label>-->
            <div class="layui-input-block">
                <input name="partnerAddress" type="text" class="layui-input" maxlength="100"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">联系人</label>
            <div class="layui-input-block">
                <input name="partnerLinkMan" lay-verify="required" required type="text" class="layui-input"/>
                <input name="partnerLinkMan" lay-verify="required" required type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">联系电话</label>
            <div class="layui-input-block">
                <input name="partnerLinkTelephone" lay-verify="required" required type="text" class="layui-input"/>
                <input name="partnerLinkTelephone" lay-verify="required|phone" required type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">合作区域</label>
            <div class="layui-input-block">
                <input name="partnerBussinessArea" lay-verify="required" required type="text" class="layui-input"/>
                <input name="partnerBussinessArea" lay-verify="required" required type="text" class="layui-input" maxlength="100"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">简介</label>
            <div class="layui-input-block">
                <input name="partnerIntroduce" lay-verify="required" required type="text" class="layui-input"/>
                <textArea name="partnerIntroduce" class="layui-textarea" maxlength="300"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">标识码</label>
            <div class="layui-input-block">
                <input name="partnerUniqueCode" lay-verify="required" required type="text" class="layui-input"/>
            </div>
        </div>

        
        <div class="layui-form-item model-form-footer">
            <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
            <button class="layui-btn" id="sure" lay-filter="partnerInfo-form-submit" permissions="
            <button class="layui-btn" lay-filter="partnerInfo-form-submit" permissions="
            partner-info-edit" lay-submit>保存
            </button>
        </div>
@@ -132,7 +135,7 @@
</script>

<script>
    layui.use(['form', 'table', 'util', 'config', 'area', 'admin'], function () {
    layui.use(['form', 'table', 'config', 'layer', 'util', 'admin', 'area', 'autocomplete'], function () {
        var form = layui.form;
        var table = layui.table;
        var config = layui.config;
@@ -140,24 +143,32 @@
        var util = layui.util;
        var admin = layui.admin;
        var area = layui.area;
        var autocomplete = layui.autocomplete;
        var laydate = layui.laydate;


        // //省份数据加载
        // area.areaData("#partnerProvince", 1, "", "");
        // //装载市区数据
        // form.on("select(partnerProvince)", function (data) {
        //     area.areasClear("#partnerlArea", 3);
        //     area.areaData("#partnerCity", 2, data.value, "");
        // });
        // //装载区县数据
        // form.on("select(partnerCity)", function (data) {
        //     area.areaData("#partnerArea", 3, data.value, "");
        // });

        //省份数据加载
        area.areaData("#hospitalProvince", 1, "", "");
        area.areaData("#province", 1, "", "");
        //装载市区数据
        form.on("select(hospitalProvince)", function (data) {
            area.areasClear("#hospitalArea", 3);
            area.areaData("#hospitalCity", 2, data.value, "");
            defaultValData();
        form.on("select(province)", function (data) {
            area.areasClear("#area", 3);
            area.areaData("#city", 2, data.value, "");
        });
        //装载区县数据
        form.on("select(hospitalCity)", function (data) {
            area.areaData("#hospitalArea", 3, data.value, "");
            defaultValData();
        });

        //赋值合作商类型数据ID
        form.on("select(partnerTypeName)", function (data) {
            $("#partnerType").val(data.value);
        form.on("select(city)", function (data) {
            area.areaData("#area", 3, data.value, "");
        });

        // 添加按钮点击事件
@@ -166,19 +177,20 @@
        });
        //// 刷新
        $('#partnerInfo-btn-update').click(function () {
            table.reload('app-table', {where: {}});
            table.reload('partnerInfo-table', { where: {} });
        });

        //渲染表格
        table.render({
            elem: '#partnerInfo-table',
            url: config.base_server + 'api-oprationcenter/partnerinfo/list',
            url: config.base_server + 'api-opration/partnerinfo',
            method: 'GET',
            headers: {'Authorization': 'Bearer ' + config.getToken().access_token},
            headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
            page: true,
            cols: [[
                {field: 'partnerName', align: 'left', width: '10%', title: '名称'},
                {field: 'partnerType', align: 'left', width: '10%', title: '类型', templet:function (d) {
                { field: 'partnerName', align: 'left', width: '10%', title: '名称' },
                {
                    field: 'partnerType', align: 'left', width: '10%', title: '类型', templet: function (d) {
                        if (d.partnerType == null) {
                            return "";
                        } else if (d.partnerType == 1) {
@@ -194,19 +206,20 @@
                        } else {
                            return "";
                        }
                    }},
                    }
                },
                {
                    field: 'partnerAddress', align: 'left', width: '10%', title: '地址', templet: function (d) {
                    field: 'partnerAddress', align: 'left', width: '20%', title: '地址', templet: function (d) {
                        return ((d.partnerProvince == null) ? "" : d.partnerProvince) + " " +
                            ((d.partnerCity == null) ? "" : d.partnerCity) + " " +
                            ((d.partnerArea == null) ? "" : d.partnerArea) + " " +
                            ((d.partnerAddress == null) ? "" : d.partnerAddress)
                    }
                },
                {field: 'partnerLinkMan', align: 'left', width: '10%', title: '联系人'},
                {field: 'partnerLinkTelephone', align: 'left', width: '10%', title: '联系电话'},
                {field: 'partnerBussinessArea', align: 'left', width: '10%', title: '合作区域'},
                {field: 'partnerUniqueCode', align: 'left', width: '10%', title: '标识码'},
                { field: 'partnerLinkMan', align: 'left', width: '7%', title: '联系人' },
                { field: 'partnerLinkTelephone', align: 'left', width: '7%', title: '联系电话' },
                { field: 'partnerBussinessArea', align: 'left', width: '15%', title: '合作区域' },
                { field: 'partnerUniqueCode', align: 'left', width: '10%', title: '标识码' },
                {
                    field: 'createTime',
                    align: 'center',
@@ -214,8 +227,7 @@
                    title: '创建日期',
                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd')}}</div>"
                },
                {field: 'id', align: 'center', width: '10%', toolbar: '#partnerInfo-bar', title: '操作', fixed: 'right'}

                { field: 'id', align: 'center', width: '10%', toolbar: '#partnerInfo-bar', title: '操作', fixed: 'right' }
            ]],
            done: function (res) {
                permissionsInput(res, config);
@@ -223,7 +235,7 @@
        });

        // 工具条点击事件
        table.on('tool(app-table)', function (obj) {
        table.on('tool(partnerInfo-table)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === 'edit') { // 查看详情
@@ -235,10 +247,10 @@
                    admin.req('api-opration/partnerinfo/' + obj.data.id, {}, function (data) {
                        layer.closeAll('loading');
                        if (data.code == 0) {
                            layer.msg(data.msg, {icon: 1, time: 2000});
                            table.reload('app-table', {});
                            layer.msg(data.msg, { icon: 1, time: 2000 });
                            table.reload('partnerInfo-table', {});
                        } else {
                            layer.msg(data.msg, {icon: 2, time: 2000});
                            layer.msg(data.msg, { icon: 2, time: 2000 });
                        }
                    }, 'delete');
                });
@@ -246,25 +258,44 @@
        });

        // 搜索按钮点击事件
        $('#app-btn-search').click(function () {
        $('#partnerInfo-btn-search').click(function () {
            var partnerName = $('#partnerName-serch').val();
            table.reload('app-table', {where: {partnerName: partnerName}, page: {curr: 1}});
            var partnerProvince = $("#province option:selected").text() != "选择省" ?
                $("#province option:selected").text() : "";
            var partnerCity = $("#city option:selected").text() != "选择市" ? $(
                "#city option:selected").text() : "";
            var partnerArea = $("#area option:selected").text() != "选择区县" ? $(
                "#area option:selected").text() : "";

            table.reload('partnerInfo-table', { where: { partnerName: partnerName, partnerProvince: partnerProvince, partnerCity: partnerCity, partnerArea: partnerArea }, page: { curr: 1 } });
        });

        // 表单提交事件
        form.on('submit(partnerInfo-form-submit)', function (data) {
            layer.load(2);
            admin.req('api-opration/partnerinfo', JSON.stringify(data.field), function (data) {
                layer.closeAll('loading');
                if (data.code == 0) {
                    // layer.msg(data.msg, { icon: 1, time: 2000 });
                    layer.closeAll();
                    table.reload('app-table', {});
                } else {
                    layer.msg(data.msg, {icon: 2, time: 2000});
                }
            }, "POST");

            if (data.field != null) {
                data.field.partnerProvince = $("#partnerProvince option:selected").text() != "选择省" ?
                    $("#partnerProvince option:selected").text() : "";
                data.field.partnerCity = $("#partnerCity option:selected").text() != "选择市" ? $(
                    "#partnerCity option:selected").text() : "";
                data.field.partnerArea = $("#partnerArea option:selected").text() != "选择区县" ? $(
                    "#partnerArea option:selected").text() : "";

                admin.req('api-opration/partnerinfo', JSON.stringify(data.field), function (data) {
                    layer.closeAll('loading');
                    if (data.code == 0) {
                        // layer.msg(data.msg, { icon: 1, time: 2000 });
                        layer.closeAll();
                        table.reload('partnerInfo-table', {});
                    } else {
                        layer.msg(data.msg, { icon: 2, time: 2000 });
                    }
                }, "POST");

            }
            return false;

        });


@@ -286,20 +317,42 @@
                    $('#app-form')[0].reset();
                    $('#app-form').attr('method', 'POST');
                    if (data) {
                        if (index == 1) {
                            $('#sure').hide();
                        }
                        // if (index == 1) {
                        //     $('#sure').hide();

                        // }
                        form.val('app-form', data);
                        // //重新装载科室
                        // getdepartment(data.hospitalId);
                        // form.render();
                        //装载省市区数据
                        if (!strUtil.isEmpty(data.partnerProvince))
                            area.areaData("#partnerProvince", 1, "", data.partnerProvince);
                        if (!strUtil.isEmpty(data.partnerCity))
                            area.areaData("#partnerCity", 2, $("#partnerProvince").val(), data
                                .partnerCity);
                        if (!strUtil.isEmpty(data.partnerArea))
                            area.areaData("#partnerArea", 3, $("#partnerCity").val(), data
                                .partnerArea);
                        form.render();
                    } else {
                        //省份数据加载
                        area.areaData("#partnerProvince", 1, "", "");
                        //装载市区数据
                        form.on("select(partnerProvince)", function (data) {
                            area.areasClear("#partnerlArea", 3);
                            area.areaData("#partnerCity", 2, data.value, "");
                        });
                        //装载区县数据
                        form.on("select(partnerCity)", function (data) {
                            area.areaData("#partnerArea", 3, data.value, "");
                        });
                    }

                    // //执行一个laydate实例
                    // laydate.render({
                    //     elem: '#startTime' //指定元素
                    //     ,type: 'datetime'
                    // });


                    //执行一个laydate实例
                    laydate.render({
                        elem: '#startTime' //指定元素
                        , type: 'datetime'
                    });


                }