Merge branch 'master' of https://gitee.com/huoxiong/empty_backstage_hx

long

2021-07-01 5f9e12be5950d00fecc2ae4ab1e91dd4b5a836e3

 src/pages/system/admin.vue

@@ -49,6 +49,7 @@
      <el-table-column label="状态" align="center" min-width="100">
        <template slot-scope="scope">
          <el-switch
            v-if="scope.row.type!=0"
            v-model="scope.row.isUse"
            :active-value="1"
            :inactive-value="0"
@@ -67,7 +68,7 @@
            @click="showEditAdminDialog(scope.row)"
          >编辑</el-button>
          <el-button
            v-if="getAuthValueFN('sys_admin_del')"
            v-if="getAuthValueFN('sys_admin_del') && scope.row.type!=0"
            size="mini"
            type="text warn"
            icon="el-icon-delete"
@@ -231,7 +232,7 @@
          }
        }
      }, (inf) => {
        this.roleArr = inf.list || []
        this.roleArr = inf.list && inf.list.filter(item => item.isUse === 1) || []
      })
    },