Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -50,7 +50,7 @@
    </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="org-form-submit" lay-submit>保存</button>
        <button class="layui-btn permissions" permissions="sysorganization-edit" id="sure" lay-filter="org-form-submit" lay-submit>保存</button>
    </div>
</form>
<script>
@@ -65,6 +65,7 @@
        var tree = parent.layui.tree;
        var $ = parent.layui.jquery;

        permissionsInput(res,config);
        //组织结构树
        var getData = function () {
            admin.req('api-user/sysorganization/getTree', { is_del: 0, enabled: 1 }, function (data) {