From 7099bd7349dbe11ed00d6f52b7f536be1d5d1411 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 28 Feb 2025 19:47:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=9A=84=E8=A7=92=E8=89=B2=E5=92=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8ID=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E5=8D=95=E9=A1=B9=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 141 +++++++++++++++++---------------
 1 file changed, 75 insertions(+), 66 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index c8153e5b..f19d3b8a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -385,8 +385,8 @@ function fnModalVisibleByEdit(userId?: string | number) {
         modalState.options.posts = posts;
         const { user, roleIds, postIds } = res.data;
         modalState.from = Object.assign(modalState.from, user);
-        modalState.from.roleIds = roleIds;
-        modalState.from.postIds = postIds;
+        modalState.from.roleIds = [2]; //roleIds;
+        modalState.from.postIds = [2]; // postIds;
         modalState.from.deptId = deptTreeData.value[0].id;
         modalState.title =
           t('common.addText') + t('views.system.user.userInfo');
@@ -753,7 +753,7 @@ function fnGetList(pageNum?: number) {
   queryParams.beginTime = queryRangePicker.value[0];
   queryParams.endTime = queryRangePicker.value[1];
   listUser(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
         tableState.selectedRowKeys = [];
@@ -809,7 +809,62 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="18" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.system.user.account')"
+              name="userName"
+            >
+              <a-input
+                v-model:value="queryParams.userName"
+                allow-clear
+                :maxlength="30"
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item :label="t('views.system.user.phone')" name="phone">
+              <a-input
+                v-model:value="queryParams.phone"
+                allow-clear
+                :maxlength="11"
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.system.user.status')"
+              name="statusFlag"
+            >
+              <a-select
+                v-model:value="queryParams.statusFlag"
+                allow-clear
+                :options="dict.sysNormalDisable"
+                :placeholder="t('common.selectPlease')"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.system.user.loginTime')"
+              name="queryRangePicker"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                allow-clear
+                bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="x"
+                style="width: 100%"
+              ></a-range-picker>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :lg="18" :md="12" :xs="24" v-if="false">
             <a-form-item
               :label="t('views.system.user.className')"
               name="deptId"
@@ -848,61 +903,6 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.account')"
-              name="userName"
-            >
-              <a-input
-                v-model:value="queryParams.userName"
-                allow-clear
-                :maxlength="30"
-                :placeholder="t('common.inputPlease')"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.phone')"
-              name="phone"
-            >
-              <a-input
-                v-model:value="queryParams.phone"
-                allow-clear
-                :maxlength="11"
-                :placeholder="t('common.inputPlease')"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="4" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.user.status')" name="statusFlag">
-              <a-select
-                v-model:value="queryParams.statusFlag"
-                allow-clear
-                :options="dict.sysNormalDisable"
-                :placeholder="t('common.selectPlease')"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.loginTime')"
-              name="queryRangePicker"
-            >
-              <a-range-picker
-                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
-                :show-time="{ format: 'HH:mm:ss' }"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
-              ></a-range-picker>
-            </a-form-item>
-          </a-col>
-        </a-row>
       </a-form>
     </a-card>
 
@@ -932,6 +932,7 @@ onMounted(() => {
             type="dashed"
             @click.prevent="fnModalUploadImportOpen()"
             v-perms:has="['system:user:import']"
+            v-if="false"
           >
             <template #icon><ImportOutlined /></template>
             {{ t('common.import') }}
@@ -940,6 +941,7 @@ onMounted(() => {
             type="dashed"
             @click.prevent="fnExportList()"
             v-perms:has="['system:user:export']"
+            v-if="false"
           >
             <template #icon><ExportOutlined /></template>
             {{ t('common.export') }}
@@ -1170,7 +1172,10 @@ onMounted(() => {
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.user.status')" name="statusFlag">
+            <a-form-item
+              :label="t('views.system.user.status')"
+              name="statusFlag"
+            >
               <DictTag
                 :options="dict.sysNormalDisable"
                 :value="modalState.from.statusFlag"
@@ -1181,10 +1186,7 @@ onMounted(() => {
 
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.phone')"
-              name="phone"
-            >
+            <a-form-item :label="t('views.system.user.phone')" name="phone">
               {{ modalState.from.phone }}
             </a-form-item>
           </a-col>
@@ -1200,6 +1202,7 @@ onMounted(() => {
           name="deptId"
           :label-col="{ span: 3 }"
           :label-wrap="true"
+          v-if="false"
         >
           <a-tree-select
             :value="modalState.from.deptId"
@@ -1218,7 +1221,7 @@ onMounted(() => {
           </a-tree-select>
         </a-form-item>
 
-        <a-row>
+        <a-row v-if="false">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.system.user.userWork')"
@@ -1352,6 +1355,7 @@ onMounted(() => {
             :md="12"
             :xs="24"
             v-perms:has="['system:user:editPost']"
+            v-if="false"
           >
             <a-form-item
               :label="t('views.system.user.userWork')"
@@ -1425,7 +1429,10 @@ onMounted(() => {
               modalState.from.userId !== userStore.userId
             "
           >
-            <a-form-item :label="t('views.system.user.status')" name="statusFlag">
+            <a-form-item
+              :label="t('views.system.user.status')"
+              name="statusFlag"
+            >
               <a-select
                 v-model:value="modalState.from.statusFlag"
                 default-value="0"
@@ -1442,6 +1449,7 @@ onMounted(() => {
           name="roleIds"
           :label-col="{ span: 3 }"
           v-perms:has="['system:user:editRole']"
+          v-if="false"
         >
           <a-select
             v-model:value="modalState.from.roleIds"
@@ -1461,6 +1469,7 @@ onMounted(() => {
           :label="t('views.system.user.fromClass')"
           name="deptId"
           :label-col="{ span: 3 }"
+          v-if="false"
         >
           <a-tree-select
             v-model:value="modalState.from.deptId"