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
diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
index 0183f0d6..81b1c97f 100644
--- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
@@ -96,147 +96,147 @@
                      <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)"
+              </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)"
+              </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-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-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>
+        <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">
@@ -268,18 +268,18 @@ 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([