Merge remote-tracking branch 'origin/dev' into dev

侯瑞军

2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea.html

@@ -10,7 +10,7 @@
        <div class="layui-form toolbar">&emsp;
            <input id="area-search-value" class="layui-input search-input" type="text" placeholder="输入地区名称"/>&emsp;
            <button id="area-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
            <button id="area-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
            <button id="area-btn-add" class="layui-btn icon-btn permissions" permissions="save-area"><i class="layui-icon">&#xe654;</i>添加</button>
            <button id="area-btn-expand" class="layui-btn">全部展开</button>
            <button id="area-btn-fold" class="layui-btn">全部折叠</button>
        </div>
@@ -21,8 +21,8 @@

<!-- 表格操作列 -->
<script type="text/html" id="area-table-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="save-area" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="del-sysarea" lay-event="del">删除</a>
</script>

<!-- 表格状态列 -->
@@ -89,6 +89,7 @@
                ]],
                    done: function () {
                        layer.closeAll('loading');
                    permissionsInput();
                    }
            });
        };
@@ -127,8 +128,7 @@
                }, 'DELETE');
            });
            }
            else if(obj.event=='edit')
            {
            else if (obj.event == 'edit') {
                showEditModel(obj.data);
            }
        });