1

src/store/market/exportuser.js

@@ -10,18 +10,20 @@ const state = () => ({});
 const mutations = {};
 
 const actions = {
-  async query({ commit }, { skip = 0, limit = undefined, ...info } = {}) {
+  async query({ commit }, { skip = 0, limit = undefined, isdel = '0', ...info } = {}) {
     const res = await this.$axios.$get(api.expertsuserInfo, {
       skip,
       limit,
+      isdel,
       ...info,
     });
     return res;
   },
-  async expertquery({ commit }, { skip = 0, limit, ...info } = {}) {
+  async expertquery({ commit }, { skip = 0, limit, isdel = '0', ...info } = {}) {
     const res = await this.$axios.$get(`${api.indexqueryinfo}`, {
       skip,
       limit,
+      isdel,
       ...info,
     });
     return res;

src/store/user/user.js

@@ -10,14 +10,15 @@ const state = () => ({});
 const mutations = {};
 
 const actions = {
-  async query({ commit }, { skip = 0, limit = undefined, ...info } = {}) {
-    const res = await this.$axios.$get(api.interface, { skip, limit, ...info });
+  async query({ commit }, { skip = 0, limit = undefined, isdel = '0', ...info } = {}) {
+    const res = await this.$axios.$get(api.interface, { skip, limit, isdel, ...info });
     return res;
   },
-  async userquery({ commit }, { skip = 0, limit = undefined, ...info } = {}) {
+  async userquery({ commit }, { skip = 0, limit = undefined, isdel = '0', ...info } = {}) {
     const res = await this.$axios.$get(api.userinterface, {
       skip,
       limit,
+      isdel,
       ...info,
     });
     return res;

src/views/superAdminCenter/adminUser/index.vue

@@ -80,7 +80,7 @@ export default {
     ...users(['query', 'fetch', 'create', 'update', 'delete']),
     ...authUser({ authUserDelete: 'delete', getAdminUser: 'query' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.query({ skip, limit, pid: this.user.uid, ...info });
+      const res = await this.getAdminUser({ skip, limit, pid: this.user.uid, isdel: '0', ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
@@ -114,8 +114,8 @@ export default {
       }
     },
     async toDelete({ data }) {
-      const res = await this.delete(data.id);
       const arr = await this.authUserDelete(data.id);
+      const res = await this.delete(data.uid);
       if (this.$checkRes(arr, '删除成功', res.errmsg || '删除失败')) this.search();
     },
     handleClose() {

src/views/superAdminCenter/user/index.vue

@@ -253,17 +253,17 @@ export default {
       if (this.user.code == 'JLCJGLY') {
         const res = await this.userquery({ skip, ...info });
         if (this.$checkRes(res)) {
-          let one = res.data.filter(i => i.status == '0');
+          let one = res.data.filter(i => i.status == '0' && i.isdel == '0');
           if (one) {
             this.$set(this, `oneList`, one);
             this.$set(this, `onetotal`, one.length);
           }
-          let two = res.data.filter(i => i.status == '1');
+          let two = res.data.filter(i => i.status == '1' && i.isdel == '0');
           if (two) {
             this.$set(this, `twototal`, two.length);
             this.$set(this, `twoList`, two);
           }
-          let three = res.data.filter(i => i.status == '2');
+          let three = res.data.filter(i => i.status == '2' && i.isdel == '0');
           if (three) {
             this.$set(this, `threeList`, three);
             this.$set(this, `threetotal`, three.length);
@@ -272,18 +272,17 @@ export default {
       } else {
         const res = await this.userquery({ skip, pid, code: this.user.code, ...info });
         if (this.$checkRes(res)) {
-          let one = res.data.filter(i => i.status == '0');
+          let one = res.data.filter(i => i.status == '0' && i.isdel == '0');
           if (one) {
             this.$set(this, `oneList`, one);
             this.$set(this, `onetotal`, one.length);
           }
-          let two = res.data.filter(i => i.status == '1');
+          let two = res.data.filter(i => i.status == '1' && i.isdel == '0');
           if (two) {
-            console.log(two);
             this.$set(this, `twototal`, two.length);
             this.$set(this, `twoList`, two);
           }
-          let three = res.data.filter(i => i.status == '2');
+          let three = res.data.filter(i => i.status == '2' && i.isdel == '0');
           if (three) {
             this.$set(this, `threeList`, three);
             this.$set(this, `threetotal`, three.length);
@@ -340,7 +339,6 @@ export default {
         type: 'warning',
       })
         .then(async () => {
-          console.log(data);
           if (data.role == '4' || data.role == '5') {
             let res = await this.delete(data.uid);
             if (this.$checkRes(res)) {