Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -31,7 +31,7 @@

<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">字典类型</label>
@@ -194,7 +194,11 @@
        // 搜索按钮点击事件
        $('#app-btn-search').click(function () {
            var key = $('#app-edit-search').val();
            table.reload('app-table', { where: { dictionariesName: key } });
            table.reload('app-table', { 
                where: { dictionariesName: key },
                page: {
                    curr: 1 
                }  });
        });
        // 修改role状态
        form.on('switch(dictionaries-tpl-state)', function (obj) {