From 4c4d201ad0c8e8e6d8456b3b997833914c5d8189 Mon Sep 17 00:00:00 2001
From: chengqf <584883665@139.com>
Date: Sun, 14 May 2023 11:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/authDept.vue | 6 +++---
 src/views/system/dept/index.vue    | 2 +-
 src/views/system/role/index.vue    | 5 +++--
 src/views/system/user/authUser.vue | 7 ++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index d1fd570..29a4968 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -22,9 +22,9 @@
               placeholder="请选择状态:"
               clearable
             >
+              <el-option label="正常" value="1"></el-option>
+              <el-option label="禁用" value="0"></el-option>
               <el-option label="全部" value=""></el-option>
-              <el-option label="禁用" :value="0"></el-option>
-              <el-option label="正常" :value="1"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -275,7 +275,7 @@ export default {
   data() {
     return {
       filterQuery: {
-        status: 1,
+        status: '1',
         companyName: "",
         checkType: "",
       },
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index b46431d..8d24550 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -190,7 +190,7 @@ export default {
       // 查询参数
       queryParams: {
         deptName: undefined,
-        status: undefined
+        status: 1
       },
       // 表单参数
       form: {},
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c9cde7e..b986128 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -18,6 +18,7 @@
           >
             <el-option label="正常" :value="0"/>
             <el-option label="禁用" :value="1"/>
+            <el-option label="全部" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -73,7 +74,7 @@
             </el-button>
             <el-button
               type="text"
-              :disabled="scope.row.roleId === 1"
+              :disabled="scope.row.roleId === '1'"
               @click="handleDelete(scope.row)"
             >删除
             </el-button>
@@ -277,7 +278,7 @@ export default {
         limit: 10,
         roleName: undefined,
         roleKey: undefined,
-        status: undefined
+        status: 0
       },
       // 表单参数
       form: {},
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index 85d6deb..4fd3c6e 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -7,9 +7,9 @@
         </el-form-item>
         <el-form-item class="query-form-item" label="账号状态:">
           <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="禁用" value="0"></el-option>
             <el-option label="正常" value="1"></el-option>
+            <el-option label="禁用" value="0"></el-option>
+            <el-option label="全部" value=""></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -71,6 +71,7 @@
             </el-button>
             <el-button
               type="text"
+              :disabled="scope.row.userName === 'admin'"
                @click.native="handleDel(scope.$index, scope.row)"
               v-hasPermi="['system:user:remove']"
             >删除
@@ -292,7 +293,7 @@ export default {
       roles: [],
       query: {
         userName: "",
-        userFlag: "",
+        userFlag: "1",
         page: 1,
         limit: 10,
         roleId: "",