From 36ea04bd70d1e4e29a6ac47e97973dff005a10fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A4=A7=E9=A5=BC?= <headone@qq.com>
Date: Sat, 12 Oct 2024 09:39:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD=E4=B8=8B=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AE=BD=E5=BA=A6=E8=BF=87=E7=AA=84=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=80=89=E4=B8=AD=E5=86=85=E5=AE=B9=E7=9C=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.RuoYi.Vue3/src/App.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Yi.RuoYi.Vue3/src/App.vue b/Yi.RuoYi.Vue3/src/App.vue
index 5262a6f2..cdaaadfb 100644
--- a/Yi.RuoYi.Vue3/src/App.vue
+++ b/Yi.RuoYi.Vue3/src/App.vue
@@ -26,3 +26,12 @@ watch(()=>token.value,async (newValue,oldValue)=>{
 })
 
 </script>
+<style>
+.el-form--inline {
+  .el-form-item {
+    .el-input, .el-cascader, .el-select, .el-autocomplete {
+      width: 180px;
+    }
+  }
+}
+</style>
\ No newline at end of file

From 605db9340c556cb8b1fda845bcc05c3d4fcd3bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A4=A7=E9=A5=BC?= <headone@qq.com>
Date: Sat, 12 Oct 2024 09:55:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=E7=94=A8=E6=88=B7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA(=E4=B8=BB?=
 =?UTF-8?q?=E8=A6=81=E6=98=AF=E5=8D=95=E5=85=83=E6=A0=BC=E6=9C=89=E7=82=B9?=
 =?UTF-8?q?=E5=AE=BD=EF=BC=8C=E5=AF=B9=E4=BA=8E=E5=AE=9E=E9=99=85=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=84=8F=E4=B9=89=E4=B8=8D=E5=A4=A7)=EF=BC=8C?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=88=97=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?(=E4=B8=BB=E8=A6=81=E6=98=AF=E7=9C=8B=E5=88=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E8=AF=B7=E6=B1=82=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=B2=A1=E6=9C=89=E8=BF=99=E4=B8=80=E5=88=97?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.RuoYi.Vue3/src/views/system/user/index.vue | 504 +++++++++---------
 1 file changed, 255 insertions(+), 249 deletions(-)

diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
index bb772cac..bb4afd5d 100644
--- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
@@ -1,237 +1,242 @@
 <template>
-   <div class="app-container">
-      <el-row :gutter="20">
-         <!--部门数据-->
-         <el-col :span="4" :xs="24">
-            <div class="head-container">
-               <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
-                  style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
-                  :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" highlight-current
-                  default-expand-all @node-click="handleNodeClick" />
-            </div>
-         </el-col>
-         <!--用户数据-->
-         <el-col :span="20" :xs="24">
-            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-               <el-form-item label="用户名称" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
-                     @keyup.enter="handleQuery" />
-               </el-form-item>
-               <el-form-item label="手机号码" prop="phone">
-                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
-                     @keyup.enter="handleQuery" />
-               </el-form-item>
-               <el-form-item label="状态" prop="state">
-                  <el-select v-model="queryParams.state" placeholder="用户状态" clearable style="width: 240px">
-                     <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                        :value="JSON.parse( dict.value)" />
-                  </el-select>
-               </el-form-item>
-               <el-form-item label="创建时间" style="width: 308px;">
-                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-                     start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-               </el-form-item>
-               <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-               </el-form-item>
-            </el-form>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
+                    style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container">
+          <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
+                   :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" highlight-current
+                   default-expand-all @node-click="handleNodeClick" />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                      @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
+                      @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="状态" prop="state">
+            <el-select v-model="queryParams.state" placeholder="用户状态" clearable style="width: 240px">
+              <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                         :value="JSON.parse( dict.value)" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间" style="width: 308px;">
+            <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+                            start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @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="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增
-                  </el-button>
-               </el-col>
-               <el-col :span="1.5">
-                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-                     v-hasPermi="['system:user:edit']">修改</el-button>
-               </el-col>
-               <el-col :span="1.5">
-                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-                     v-hasPermi="['system:user:remove']">删除</el-button>
-               </el-col>
-               <el-col :span="1.5">
-                  <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">
-                     导入</el-button>
-               </el-col>
-               <el-col :span="1.5">
-                  <el-button type="warning" plain icon="Download" @click="handleExport"
-                     v-hasPermi="['system:user:export']">导出</el-button>
-               </el-col>
-               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-            </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                       v-hasPermi="['system:user:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                       v-hasPermi="['system:user:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">
+              导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['system:user:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
 
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-               <el-table-column type="selection" width="50" align="center" />
-               <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
-               <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-                  :show-overflow-tooltip="true" />
-               <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible"
-                  :show-overflow-tooltip="true" />
-               <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible"
-                  :show-overflow-tooltip="true" />
-               <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
-                />
-               <el-table-column label="状态" align="state" key="state" v-if="columns[5].visible">
-                  <template #default="scope">
-                     <el-switch v-model="scope.row.state" :active-value=true :inactive-value=false
-                        @change="handleStatusChange(scope.row)"></el-switch>
-                  </template>
-               </el-table-column>
-               <el-table-column label="创建时间" align="center" prop="creationTime" v-if="columns[6].visible" width="160">
-                  <template #default="scope">
-                     <span>{{ parseTime(scope.row.creationTime) }}</span>
-                  </template>
-               </el-table-column>
-               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-                  <template #default="scope">
-                     <el-tooltip content="修改" placement="top" v-if="scope.row.userName != 'cc'">
-                        <el-button link icon="Edit" @click="handleUpdate(scope.row)"
-                           v-hasPermi="['system:user:edit']"></el-button>
-                     </el-tooltip>
-                     <el-tooltip content="删除" placement="top" v-if="scope.row.userName != 'cc'">
-                        <el-button link icon="Delete" @click="handleDelete(scope.row)"
-                           v-hasPermi="['system:user:remove']"></el-button>
-                     </el-tooltip>
-                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userName != 'cc'">
-                        <el-button link icon="Key" @click="handleResetPwd(scope.row)"
-                           v-hasPermi="['system:user:resetPwd']"></el-button>
-                     </el-tooltip>
-                     <!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'cc'">
-                        <el-button link icon="CircleCheck" @click="handleAuthRole(scope.row)"
-                           v-hasPermi="['system:user:edit']"></el-button>
-                     </el-tooltip> -->
-                  </template>
-               </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0"          :total="Number(total)" v-model:page="queryParams.skipCount"
-               v-model:limit="queryParams.maxResultCount" @pagination="getList" />
-         </el-col>
-      </el-row>
-
-      <!-- 添加或修改用户配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-         <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="用户昵称" prop="nick">
-                     <el-input v-model="form.nick" placeholder="请输入用户昵称" maxlength="30" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="归属部门" prop="deptId">
-                     <el-tree-select v-model="form.deptId" :data="deptOptions"
-                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
-                        placeholder="请选择归属部门" check-strictly />
-                  </el-form-item>
-               </el-col>
-            </el-row>
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="手机号码" prop="phone">
-                     <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="邮箱" prop="email">
-                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-                  </el-form-item>
-               </el-col>
-            </el-row>
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item v-if="form.id == undefined" label="用户账号" prop="userName">
-                     <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item v-if="form.id == undefined" label="用户密码" prop="password">
-                     <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
-                        show-password />
-                  </el-form-item>
-               </el-col>
-            </el-row>
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="用户性别">
-                     <el-select v-model="form.sex" placeholder="请选择">
-                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value "></el-option>
-                     </el-select>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="状态">
-                     <el-radio-group v-model="form.state">
-                        <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value" :value="JSON.parse(dict.value)">{{dict.label}}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="岗位">
-                     <el-select v-model="form.postIds" multiple placeholder="请选择">
-                        <el-option v-for="item in postOptions" :key="item.id" :label="item.postName"
-                           :value="item.id" :disabled="item.state == false"></el-option>
-                     </el-select>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="角色">
-                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                        <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
-                           :disabled="item.state ==false"></el-option>
-                     </el-select>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-            <el-row>
-               <el-col :span="24">
-                  <el-form-item label="备注">
-                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-         <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-            :action="upload.url" :disabled="upload.isUploading"
-            :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-            <el-icon class="el-icon--upload">
-               <upload-filled />
-            </el-icon>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <template #tip>
-               <div class="el-upload__tip text-center">
-                  <!-- <div class="el-upload__tip">
-                     <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  </div> -->
-                  <span>仅允许导入xls、xlsx格式文件。</span>
-                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-                     @click="importTemplate">下载模板</el-link>
-               </div>
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" />
+          <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+                           :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible"
+                           :show-overflow-tooltip="true" />
+          <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[7].visible">
+            <template #default="scope">
+              <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
             </template>
-         </el-upload>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitFileForm">确 定</el-button>
-               <el-button @click="upload.open = false">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+          </el-table-column>
+          <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible"
+                           :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
+          />
+          <el-table-column label="状态" align="state" key="state" v-if="columns[5].visible">
+            <template #default="scope">
+              <el-switch v-model="scope.row.state" :active-value=true :inactive-value=false
+                         @change="handleStatusChange(scope.row)"></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="creationTime" v-if="columns[6].visible" width="160">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.creationTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-tooltip content="修改" placement="top" v-if="scope.row.userName != 'cc'">
+                <el-button link icon="Edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['system:user:edit']"></el-button>
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top" v-if="scope.row.userName != 'cc'">
+                <el-button link icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['system:user:remove']"></el-button>
+              </el-tooltip>
+              <el-tooltip content="重置密码" placement="top" v-if="scope.row.userName != 'cc'">
+                <el-button link icon="Key" @click="handleResetPwd(scope.row)"
+                           v-hasPermi="['system:user:resetPwd']"></el-button>
+              </el-tooltip>
+              <!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'cc'">
+                 <el-button link icon="CircleCheck" @click="handleAuthRole(scope.row)"
+                    v-hasPermi="['system:user:edit']"></el-button>
+              </el-tooltip> -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0"          :total="Number(total)" v-model:page="queryParams.skipCount"
+                    v-model:limit="queryParams.maxResultCount" @pagination="getList" />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="nick">
+              <el-input v-model="form.nick" placeholder="请输入用户昵称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <el-tree-select v-model="form.deptId" :data="deptOptions"
+                              :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
+                              placeholder="请选择归属部门" check-strictly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.id == undefined" label="用户账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.id == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择">
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value "></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.state">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value" :value="JSON.parse(dict.value)">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择">
+                <el-option v-for="item in postOptions" :key="item.id" :label="item.postName"
+                           :value="item.id" :disabled="item.state == false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
+                           :disabled="item.state ==false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                 :action="upload.url" :disabled="upload.isUploading"
+                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload">
+          <upload-filled />
+        </el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <!-- <div class="el-upload__tip">
+               <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+            </div> -->
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                     @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="User">
@@ -263,28 +268,29 @@ const postOptions = ref([]);
 const roleOptions = ref([]);
 /*** 用户导入参数 */
 const upload = reactive({
-   // 是否显示弹出层（用户导入）
-   open: false,
-   // 弹出层标题（用户导入）
-   title: "",
-   // 是否禁用上传
-   isUploading: false,
-   // 是否更新已经存在的用户数据
-   updateSupport: 0,
-   // 设置上传的请求头部
-   headers: { Authorization: "Bearer " + getToken() },
-   // 上传的地址
-   url: import.meta.env.VITE_APP_BASE_API + "/user/import"
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/user/import"
 });
 // 列显隐信息
 const columns = ref([
-   { key: 0, label: `用户编号`, visible: true },
-   { key: 1, label: `用户名称`, visible: true },
-   { key: 2, label: `用户昵称`, visible: true },
-   { key: 3, label: `部门`, visible: true },
-   { key: 4, label: `手机号码`, visible: true },
-   { key: 5, label: `状态`, visible: true },
-   { key: 6, label: `创建时间`, visible: true }
+  { key: 0, label: `用户编号`, visible: false },
+  { key: 1, label: `用户名称`, visible: true },
+  { key: 2, label: `用户昵称`, visible: true },
+  { key: 3, label: `部门`, visible: true },
+  { key: 4, label: `手机号码`, visible: true },
+  { key: 5, label: `状态`, visible: true },
+  { key: 6, label: `创建时间`, visible: true },
+  { key: 7, label: `性别`, visible: true }
 ]);
 
 const data = reactive({