From 0ec14c5d19c050b60954c51c81ca7b97214cae8f Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Thu, 18 May 2023 17:29:27 +0800
Subject: [PATCH] 1

---
 src/views/system/dept/index.vue      | 5 +++++
 src/views/system/role/authUser.vue   | 1 -
 src/views/system/role/selectUser.vue | 1 -
 src/views/system/user/index.vue      | 8 ++++----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 66f1055..5123f41 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -72,6 +72,11 @@
         prop="deptName"
         width="260"
       ></el-table-column>
+      <el-table-column
+        label="部门编码"
+        prop="deptId"
+        width="260"
+      ></el-table-column>
       <el-table-column
         align="center"
         label="排序"
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index e487276..5584c2a 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -146,7 +146,6 @@ const userIds = ref([]);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  isDelete: "0",
   roleId: route.params.roleId,
   username: undefined,
   phone: undefined,
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index bdd20da..4098d94 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -116,7 +116,6 @@ const userIds = ref([]);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  isDelete: "0",
   roleId: undefined,
   username: undefined,
   phone: undefined,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e95cd05..fbd25d6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -467,8 +467,10 @@
           <div class="el-upload__tip text-center">
             <ol style="text-align: start;margin-left: 20px;">
               <li>(*)为必填项</li>
-              <li>角色,岗位请填数字编号</li>
-              <li>角色,岗位若存在多个,| 隔开即可</li>
+              <li>部门,角色,岗位请填数字编号</li>
+              <li>角色,岗位若存在多个,请以英文逗号隔开</li>
+              <li>禁止任何的换行或空格</li>
+              <li style="color:#F00;font-size:13px;">请手动更改单元格格式为文本格式</li>
               <li><span>仅允许导入xls、xlsx格式文件。</span>
                 <el-link
                     :underline="false"
@@ -557,7 +559,6 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    isDelete: "0",
     userName: undefined,
     phone: undefined,
     status: undefined,
@@ -815,7 +816,6 @@ function reset() {
     email: undefined,
     gender: undefined,
     status: "1",
-    isDelete: "0",
     remark: undefined,
     postIds: [],
     roleIds: [],