12/13 xx

src/api/admin.js

@@ -7,311 +7,7 @@ export default {
     getUserInfo() {
         return axios.get('/permission/api/system/userinfo')
     },
-    /**
-     * 修改密码
-     */
-    ChangePassword(params) {
-        return axios({
-            url: '/permission/api/admin/changePassword',
-            method: 'post',
-            params: params
-        })
-    },
-    /**
-     * 重置密码
-     */
-    ResetPassword(params) {
-        return axios({
-            url: '/permission/api/admin/resetPassword',
-            method: 'post',
-            params: params
-        })
-    },
-    /**
-     * 获取验证码
-     */
-    getVerifyCode() {
-        return axios.get('/permission/api/admin/verifyCode')
-    },
-    /**
-     * 获取用户权限
-     */
-    getPermissionList(params) {
-        return axios.get('/permission/api/system/getPermissionList', {params})
-    },
-    /**
-     * 用户登录
-     */
-    adminLogin(data) {
-        return axios.post('/permission/api/admin/login', data)
-    },
-    /**
-     * 判断是否用户登录
-     */
-    IsadminLogin(params) {
-        return axios({
-            url: '/permission/api/system/getLoginStatusByToken',
-            method: 'post',
-            params: params
-        })
-        // return axios.post('/permission/api/system/getLoginStatusByToken', params)
-    },
-    /**
-     * 退出登录
-     */
-    adminLogout() {
-        return axios.post('/permission/api/admin/logout')
-    },
 
-    /**
-     * 查询租户
-     */
-    getTenantList(params) {
-        return axios.get('/permission/api/tenant/queryPageList', {params})
-    },
-    /**
-     * 编辑租户
-     */
-    editTenant(data) {
-        return axios.post('/permission/api/tenant/update', data)
-    },
-    /**
-     * 新增租户
-     */
-    addTenant(data) {
-        return axios.post('/permission/api/tenant/add', data)
-    },
-    /**
-     * 删除租户
-     */
-    deleteTenant(params) {
-        return axios({
-            url: '/permission/api/tenant/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询应用
-     */
-    getApplyList(params) {
-        return axios.get('/permission/api/application/queryPageList', {params})
-    },
-    /**
-     * 通过应用ID查询关联租户
-     */
-    getAllTenantByApplicationId(params) {
-        return axios.get('/permission/api/application/getAllTenantByApplicationId', {params})
-    },
-    /**
-     * 编辑应用
-     */
-    editApply(data) {
-        return axios.post('/permission/api/application/update', data)
-    },
-    /**
-     * 新增应用
-     */
-    addApply(data) {
-        return axios.post('/permission/api/application/add', data)
-    },
-    /**
-     * 删除应用
-     */
-    deleteApply(params) {
-        return axios({
-            url: '/permission/api/application/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询功能
-     */
-    getFunctionList(params) {
-        return axios.get('/permission/api/function/queryPageList', {params})
-    },
-    /**
-     * 查询类型为展示的功能
-     */
-    getFuncListByTypeIsShow(params) {
-        return axios.get('/permission/api/function/getFuncListByTypeIsShow', {params})
-    },
-    /**
-     * 编辑功能
-     */
-    editFunction(data) {
-        return axios.post('/permission/api/function/update', data)
-    },
-    /**
-     * 新增功能
-     */
-    addFunction(data) {
-        return axios.post('/permission/api/function/add', data)
-    },
-    /**
-     * 删除功能
-     */
-    deleteFunction(params) {
-        return axios({
-            url: '/permission/api/function/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询部门
-     */
-    getDepartmentList(params) {
-        return axios.get('/permission/api/department/queryPageList', {params})
-    },
-    /**
-     * 编辑部门
-     */
-    editDepartment(data) {
-        return axios.post('/permission/api/department/update', data)
-    },
-    /**
-     * 新增部门
-     */
-    addDepartment(data) {
-        return axios.post('/permission/api/department/add', data)
-    },
-    /**
-     * 删除部门
-     */
-    deleteDepartment(params) {
-        return axios({
-            url: '/permission/api/department/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询职位
-     */
-    getPositionList(params) {
-        return axios.get('/permission/api/position/queryPageList', {params})
-    },
-    /**
-     * 编辑职位
-     */
-    editPosition(data) {
-        return axios.post('/permission/api/position/update', data)
-    },
-    /**
-     * 新增职位
-     */
-    addPosition(data) {
-        return axios.post('/permission/api/position/add', data)
-    },
-    /**
-     * 删除职位
-     */
-    deletePosition(params) {
-        return axios({
-            url: '/permission/api/position/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询人员
-     */
-    getPersonnelList(data) {
-        return axios.post('/permission/api/personnel/queryPageList', data)
-    },
-    /**
-     * 编辑人员
-     */
-    editPersonnel(data) {
-        return axios.post('/permission/api/personnel/update', data)
-    },
-    /**
-     * 新增人员
-     */
-    addPersonnel(data) {
-        return axios.post('/permission/api/personnel/add', data)
-    },
-    /**
-     * 删除人员
-     */
-    deletePersonnel(params) {
-        return axios({
-            url: '/permission/api/personnel/delete',
-            method: 'post',
-            params: params
-        })
-    },
-
-    /**
-     * 查询角色
-     */
-    getRoleList(params) {
-        return axios.get('/permission/api/role/queryPageList', {params})
-    },
-    /**
-     * 编辑角色
-     */
-    editRole(data) {
-        return axios.post('/permission/api/role/update', data)
-    },
-    /**
-     * 新增角色
-     */
-    addRole(data) {
-        return axios.post('/permission/api/role/add', data)
-    },
-    /**
-     * 删除角色
-     */
-    deleteRole(params) {
-        return axios({
-            url: '/permission/api/role/delete',
-            method: 'post',
-            params: params
-        })
-    },
-    /**
-     * 获取功能数据列表
-     */
-    getDataList(params) {
-        return axios.post('/permission/api/data/getDataByFunctionIds', params)
-    },
-    /**
-     *
-     * 查询用户组
-     */
-    getGroupList(params) {
-        return axios.get('/permission/api/userGroup/queryPageList', {params})
-    },
-    /**
-     * 编辑用户组
-     */
-    editGroup(data) {
-        return axios.post('/permission/api/userGroup/update', data)
-    },
-    /**
-     * 新增用户组
-     */
-    addGroup(data) {
-        return axios.post('/permission/api/userGroup/add', data)
-    },
-    /**
-     * 删除用户组
-     */
-    deleteGroup(params) {
-        return axios({
-            url: '/permission/api/userGroup/delete',
-            method: 'post',
-            params: params
-        })
-    },
 
     /**
      *
@@ -325,35 +21,7 @@ export default {
         })
     },
 
-    /**
-     *
-     * 查询数据权限
-     */
-    getDataList(params) {
-        return axios.get('/permission/api/data/queryList', {params})
-    },
-    /**
-     * 编辑数据权限
-     */
-    editData(data) {
-        return axios.post('/permission/api/data/update', data)
-    },
-    /**
-     * 新增数据权限
-     */
-    addData(data) {
-        return axios.post('/permission/api/data/add', data)
-    },
-    /**
-     * 删除数据权限
-     */
-    deleteData(params) {
-        return axios({
-            url: '/permission/api/data/delete',
-            method: 'post',
-            params: params
-        })
-    },
+  
     /**
      * 获取租户类型
      */
@@ -361,94 +29,6 @@ export default {
         return axios.get('/permission/api/system/getDict', {params})
     },
 
-    /**
-     * 获取所有部门
-     */
-    getAllDepartmentList(params) {
-        return axios.get('/permission/api/department/getDepartmentList', {params})
-    },
-
-    /**
-     * 获取所有职位
-     */
-    getAllPositionList(params) {
-        return axios.get('/permission/api/position/getPositionList', {params})
-    },
-
-    /**
-     * 获取所有人员
-     */
-    getAllPersonnelList(params) {
-        return axios.get('/permission/api/personnel/getPersonnelList', {params})
-    },
-
-    /**
-     * 获取所有角色
-     */
-    getAllRoleList(params) {
-        return axios.get('/permission/api/role/getRoleList', {params})
-    },
-
-    /**
-     * 获取所有用户组
-     */
-    getAllUserGroupList(params) {
-        return axios.get('/permission/api/userGroup/getUserGroupList', {params})
-    },
-    /**
-     * 获取所有租户
-     */
-    getAllTenantList(params) {
-        return axios.get('/permission/api/tenant/getTenantList', {params})
-    },
-
-    /**
-     * 获取所有应用
-     */
-    getAllApplicationList(params) {
-        return axios.get('/permission/api/application/getApplicationList', {params})
-    },
-
-    /**
-     * 获取所有功能
-     */
-    getAllFunctionList(params) {
-        return axios.get('/permission/api/function/getFunctionList', {params})
-    },
-
-    /**
-     * 获取所有功能
-     */
-    addRolePersonnelBatch(params) {
-        return axios.post('/permission/api/role/addRolePersonnelBatch', params)
-    },
-    
-    /**
-     * 会员类别权限管理新增
-     */
-    addNewTenantVipType(params) {
-        return axios.post('/permission/api/tenantVipType/addNew', params)
-  },
-    
-    /**
-     * 会员类别权限管理查询
-     */
-    queryTenantVipType(params) {
-        return axios.post('/permission/api/tenantVipType/queryTenantVipType', params)
-  },
-    
-    /**
-     * 会员类别权限管理更新
-     */
-    updateNewTenantVipType(params) {
-        return axios.post('/permission/api/tenantVipType/update', params)
-  },
-    
-    /**
-     * 会员类别权限管理删除
-     */
-    deleteTenantVipType(params) {
-        return axios.get('/permission/api/tenantVipType/delete', {params})
-    },
+  
 
 }

src/api/department.js

@@ -30,4 +30,15 @@ export default {
         return axios.post('/permission/api/department/update', data)
     },
 
+    /**
+     * 删除部门
+     */
+    deleteDepartment(params) {
+        return axios({
+            url: '/permission/api/department/delete',
+            method: 'post',
+            params: params
+        })
+    },
+
 }

src/api/position.js

@@ -8,9 +8,18 @@ export default {
         return axios.get('/permission/api/position/queryPageList', {params})
     },
     /**
+     * 获取职位信息
+     * @param {*} data
+     * @returns
+     */
+    queryPositionInfo(params){
+        return axios.get('/permission/api/position/queryPositionInfo', {params})
+    },
+    /**
+     * 
      * 编辑职位
      */
-    editPosition(data) {
+    updatePosition(data) {
         return axios.post('/permission/api/position/update', data)
     },
     /**

src/views/backStageManage/organization/department/addDepartment.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <departmentFrom model="add"></departmentFrom>
+        <departmentFrom :lastName="lastName" :parentId="parentId" :parentPath="parentPath" model="add"></departmentFrom>
     </div>
 </template>
 
@@ -15,7 +15,17 @@ export default {
         return {};
     },
     watch: {},
-    computed: {},
+    computed: {
+        parentId() {
+            return this.$route.query.parentId;
+        },
+        lastName() {
+            return this.$route.query.lastName;
+        },
+        parentPath(){
+            return this.$route.query.parentPath
+        }
+    },
     created() {},
     mounted() {},
     methods: {},

src/views/backStageManage/organization/department/components/department.vue

@@ -10,7 +10,6 @@
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                <!-- <el-button type="primary" plain icon="el-icon-plus" size="small" @click="handleAdd(0)">新增</el-button> -->
               </el-form-item>
             </el-form>
             <el-row :gutter="10" class="mb8">
@@ -26,21 +25,15 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              height="calc(100% - 0)"
+              height="calc(100% - 0px)"
               v-loading="loading"
           >
               <el-table-column prop="name" label="部门名称" align="" show-overflow-tooltip></el-table-column>
               <el-table-column prop="tenantName" label="所属租户" align="center" show-overflow-tooltip></el-table-column>
-              <el-table-column label="角色" align="center" show-overflow-tooltip>
-                <template slot-scope="scope">
-                <span v-for="item in scope.row.roleList">{{item.name}}
-                </span>
-                </template>
-              </el-table-column>
               <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip></el-table-column>
               <el-table-column label="操作" align="center" width="280">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row.id, scope.row)">新增</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)">新增</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">修改</el-button>
                     <el-button v-if="scope.row.id != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -48,10 +41,10 @@
           </el-table>
         </el-main>
         <el-footer class="pagination">
-                <el-pagination background layout="total, sizes, prev, pager, next, jumper"
+            <el-pagination background layout="total, sizes, prev, pager, next, jumper"
                 :current-page.sync="queryParams.current" :page-size.sync="queryParams.size"
                 @current-change="handleCurrentChange" @size-change="changeSize" :total="total">
-                </el-pagination>
+            </el-pagination>
         </el-footer>
       </el-container>
     </div>
@@ -63,13 +56,10 @@ export default {
     props: {},
     data() {
         return {
-            visible: false,
-            btnLoading: false,
             // 遮罩层
             loading: false,
             // 总条数
             total: 0,
-            lastName: '',
             tableData: [],
             // 查询参数
             queryParams: {
@@ -98,11 +88,11 @@ export default {
                             if (data.hasOwnProperty('children')) {
                                 for (var j = 0; j < data.children.length; j++) {
                                     if(data.hasOwnProperty('last')){
-                                        data.children[i].last=data.last+'/'+data.name
+                                        data.children[j].last=data.last+'/'+data.name
                                     }else{
-                                        data.children[i].last=data.name
+                                        data.children[j].last=data.name
                                     }
-                                    l(data.children[i])
+                                    l(data.children[j])
                                 }
                             }
                         }
@@ -136,37 +126,20 @@ export default {
 
         },
 
-        // handleAdd(updepartmentId,row) {
-        //     console.log(row)
-        //     this.title = '新增部门'
-        //     this.visible = true
-        //     if(updepartmentId==0){
-        //         this.show=false
-        //         this.ruleForm = {
-        //             updepartment:updepartmentId
-        //         }
-        //     }else{
-        //         this.show=true
-        //         if(row.hasOwnProperty('last')){
-        //             this.lastName=row.last+'/'+row.name
-        //         }else{
-        //             this.lastName=row.name
-        //         }
-        //         this.ruleForm = {
-        //             updepartment:updepartmentId,
-        //             updepartmentName:row.name,
-        //             path:row.path
-        //         }
-        //     }
-        // },
 
         /** 新增按钮操作 */
-        handleAdd(updepartmentId,row) {
+        handleAdd(row) {
+            var query = {}
+            if(row){//新增子节点
+                query={
+                    parentId:row.id,
+                    lastName:row.last || row.name,
+                    parentPath:row.path
+                }
+            }
             this.$router.push({
                 path: '/administrator/addDepartment',
-                query: {
-                    id
-                }
+                query: query
             });
         },
 
@@ -174,7 +147,8 @@ export default {
             this.$router.push({ 
                 path: '/administrator/editDepartment', 
                 query: {
-                    id: row.id
+                    id: row.id,
+                    lastName:row.last,
                 }
             });
         },
@@ -191,6 +165,22 @@ export default {
             this.handleQuery();
         },
 
+        handleDelete(row) {
+            this.$confirm('确认删除本条数据吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                    this.loading = true
+                    this.$api.deleteDepartment({ id: row.id }).then(response => {
+                    this.$message.success('删除成功')
+                    this.loading = false
+                    this.getList()
+                }).catch(error => {
+                    this.loading = false
+                })
+            })
+        },
        
     },
 };

src/views/backStageManage/organization/department/components/form/department.vue

@@ -5,8 +5,8 @@
                 <el-button size="small"  @click="init">重 置</el-button>
         </div>
         <div class="form_center" >
-            
-            <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" :class="model == 'detail'?'pointer_events_none':''">
+
+            <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px">
                 <el-form-item label="所属租户" prop="tenant">
                     <el-tooltip
                         class="item"
@@ -19,7 +19,7 @@
                     </el-tooltip>
                 </el-form-item>
         
-                <el-form-item label="所属部门" prop="updepartment" v-if="show==true">
+                <el-form-item label="所属部门" prop="updepartment" v-if="parentId">
                     <el-input v-model="lastName" placeholder="请输入所属部门" :disabled="true"></el-input>
                 </el-form-item>
                 
@@ -27,12 +27,6 @@
                     <el-input v-model="form.name" placeholder="请输入部门名称"></el-input>
                 </el-form-item>
 
-                <el-form-item label="角色" prop="role">
-                    <el-select v-model="form.role" filterable multiple collapse-tags placeholder="请选择角色" :disabled="disabled" style="display:block">
-                        <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-
                 <el-form-item label="备注：" prop="remark">
                     <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50" />
                 </el-form-item>
@@ -45,17 +39,23 @@
 const currentForm = {
     id:null,
     name:null,
-    tenantId:null,
-    tenantName:null,
     role:[],
-    roleList:[],
+    updepartment:null,
+    path:null,
+    tenant:null,
+    tenantName:null,
     remark:null
 }
 export default {
     components: {},
     mixins:[],
     props: {
-        id:"",
+        id:null,
+        lastName:null,
+        parentId:{
+            default:0
+        },
+        parentPath:null,
         model:{
             type:String,
             default:"add"
@@ -66,8 +66,6 @@ export default {
             btnLoading: false,
             // 表单参数
             form: {},
-            lastName:'',
-            roleList:[],
             // 表单校验
             rules: {
                 name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
@@ -119,7 +117,11 @@ export default {
         },
         //重置表单
         resetForm(){
-            this.form = Object.assign({}, currentForm)
+            this.form = Object.assign({}, currentForm,{
+                    updepartment:this.parentId,
+                    path:this.parentPath,
+                    tenant:this.userinfo.tenantId,
+                })
             this.$refs['form'].resetFields();
         },
         /** 提交按钮 */
@@ -147,31 +149,18 @@ export default {
                 }
             });
         },
-
-        getTenantList(){
-            this.$api.getAllTenantList().then(response => {
-                this.tenantList = response.data
-            })
-        },
-
-        getRoleList() {
-            this.$api.getAllRoleList().then((response) => {
-            this.roleList = response.data;
-            var a = this.userinfo.rList.findIndex((item) => {
-                return item.roleId == 1;
-                });
-                if(a == -1){
-                    var b = this.roleList.findIndex(i=>{
-                    return i.id == 1
-                    })
-                    if(b !=-1){
-                    this.roleList[b].disabled=true
+        finish(){
+            if(this.model == 'add'){
+                this.init()
+            }else{
+                this.$store.commit('removeHistoryPath',this.$route.path);
+                this.$store.commit('removeHistory',this.$route.path);
+                this.$router.push(
+                    {
+                        path:'/administrator/department'
                     }
-                    
-                }else{
-                    this.roleList[0].disabled=false
-                }
-            });
+                )
+            }
         },
     },
 };

src/views/backStageManage/organization/department/editDepartment.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <departmentForm :id="id" model="edit"></departmentForm>
+        <departmentForm :id="id" :lastName="lastName" model="edit"></departmentForm>
     </div>
 </template>
 
@@ -19,6 +19,9 @@ export default {
         id() {
             return this.$route.query.id;
         },
+        lastName() {
+            return this.$route.query.lastName;
+        },
     },
     created() {},
     mounted() {},

src/views/backStageManage/organization/position/components/form/position.vue

@@ -45,15 +45,14 @@ const currentForm = {
     position:null,
     tenant:null,
     tenantName:null,
-    ismore:null,
-    role:[],
+    ismore:0,
     describe:null
 }
 export default {
     components: {},
     mixins:[],
     props: {
-        id:"",
+        id:null,
         model:{
             type:String,
             default:"add"
@@ -62,12 +61,8 @@ export default {
     data() {
         return {
             btnLoading: false,
-            disabled:false,
             // 表单参数
-            form: {
-                ismore:0,
-            },
-            lastName:'',
+            form: {},
             rules: {
                 department: [{ required: true, message: '请选择所属部门', trigger: 'change' },],
                 position: [{ required: true, message: '请输入职位名称', trigger: 'blur' },],
@@ -120,7 +115,9 @@ export default {
         },
         //重置表单
         resetForm(){
-            this.form = Object.assign({}, currentForm)
+            this.form = Object.assign({}, currentForm, {
+                tenant:this.userinfo.tenantId,
+            })
             this.$refs['form'].resetFields();
         },
         /** 提交按钮 */
@@ -138,6 +135,7 @@ export default {
                         if (response.code === 200) {
                             this.btnLoading = false
                             this.$message.success( a + '成功');
+                            this.finish()
                         }
                     })
                     .catch(error => {
@@ -148,10 +146,18 @@ export default {
             });
         },
 
-        getTenantList(){
-            this.$api.getAllTenantList().then(response => {
-                this.tenantList = response.data
-            })
+        finish(){
+            if(this.model == 'add'){
+                this.init()
+            }else{
+                this.$store.commit('removeHistoryPath',this.$route.path);
+                this.$store.commit('removeHistory',this.$route.path);
+                this.$router.push(
+                    {
+                        path:'/administrator/position'
+                    }
+                )
+            }
         },
     },
 };

src/views/backStageManage/organization/position/components/position.vue

@@ -8,11 +8,10 @@
                 <el-input v-model="queryParams.name" placeholder="请输入职位名称"/>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="search">搜索</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-form>
-            
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
@@ -26,11 +25,10 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              height="calc(100% - 0)"
+              height="calc(100% - 0px)"
               v-loading="loading"
           >
             <el-table-column prop="position" label="职位名称"></el-table-column>
-            
             <el-table-column  label="是否唯一" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span style="margin-left: 10px" v-if="scope.row.ismore==0">否</span>
@@ -72,7 +70,6 @@ export default {
             // 总条数
             total: 0,
             tableData: [],
-            tenantList:[],
             // 查询参数
             queryParams: {
                 current: 1,
@@ -87,15 +84,8 @@ export default {
     created() {},
     mounted() {
         this.getList()
-        this.getTenantList()
     },
     methods: {
-        //检索
-        search(){
-            this.queryParams.current = 1
-            this.getList()
-        },
-
         //查询职位列表
         getList() {
             this.loading = true
@@ -104,16 +94,12 @@ export default {
                 this.total = response.pageColumn.total
                 this.loading = false
             }).catch(error => {
+                this.tableData = []
+                this.total = 0
                 this.loading = false
             })
         },
 
-        getTenantList(){
-            this.$api.getAllTenantList().then(response => {
-                this.tenantList = response.data
-            })
-        },
-
         //切换分页
         handleCurrentChange(val){
             this.queryParams.current = val
@@ -132,7 +118,9 @@ export default {
 
         },
 
-        handleAdd(parentId) {},
+        handleAdd() {
+            this.$router.push('/administrator/addPosition');
+        },
 
         handleEdit(row) {
             this.$router.push({ 
@@ -153,7 +141,7 @@ export default {
                     this.$api.deletePosition({ id: row.id }).then(response => {
                     this.$message.success('删除成功')
                     this.loading = false
-                    this.getList()
+                    this.resetQuery()
                 }).catch(error => {
                     this.loading = false
                 })