From f13dcac7db3aac6f38ad9a617bc93d04947bf061 Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Fri, 14 Feb 2025 17:03:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B4=A6=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/user/index.vue               | 16 ++++++++++++++--
 src/views/manage/user/modules/user-search.vue | 18 +++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/manage/user/index.vue b/src/views/manage/user/index.vue
index 8b1c1eb..015dfcb 100644
--- a/src/views/manage/user/index.vue
+++ b/src/views/manage/user/index.vue
@@ -18,7 +18,7 @@ const scrollConfig = computed(() => {
   };
 });
 
-const { columns, columnChecks, data, loading, getData, mobilePagination, searchParams, resetSearchParams } = useTable({
+const { columns, columnChecks, data, loading, getData, mobilePagination, searchParams } = useTable({
   apiFn: doGetsysUserList,
   apiParams: {
     pageNum: 1,
@@ -155,6 +155,18 @@ async function getUserDeptTree() {
     deptTreeData.value = tree;
   }
 }
+const handleReset = () => {
+  const currentPageSize = searchParams.pageSize;
+
+  searchParams.userName = '';
+  searchParams.phonenumber = '';
+  searchParams.status = undefined;
+  searchParams.deptId = undefined;
+  searchParams.pageNum = 1;
+  searchParams.pageSize = currentPageSize;
+
+  getData();
+};
 </script>
 
 <template>
@@ -163,7 +175,7 @@ async function getUserDeptTree() {
       <UserSearch
         v-model:model="searchParams"
         :dept-tree-data="deptTreeData"
-        @reset="resetSearchParams"
+        @reset="handleReset"
         @search="getData"
       />
       <ACard
diff --git a/src/views/manage/user/modules/user-search.vue b/src/views/manage/user/modules/user-search.vue
index 8bf1302..1fdd6cf 100644
--- a/src/views/manage/user/modules/user-search.vue
+++ b/src/views/manage/user/modules/user-search.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
 import { enableStatusOptions } from '@/constants/business';
+import { computed } from 'vue';
 
 defineOptions({
   name: 'UserSearch'
@@ -19,7 +20,14 @@ const emit = defineEmits<Emits>();
 
 const model = defineModel<Api.SystemManage.UserSearchParams>('model', { required: true });
 
+// 使用计算属性来处理双向绑定
+const formModel = computed({
+  get: () => model.value,
+  set: (val) => model.value = val
+});
+
 function reset() {
+  // 只触发重置事件
   emit('reset');
 }
 
@@ -30,21 +38,21 @@ function search() {
 
 <template>
   <ACard :title="$t('common.search')" :bordered="false" class="card-wrapper">
-    <AForm :model="model" :label-width="80">
+    <AForm :model="formModel" :label-width="80">
       <ARow :gutter="[16, 16]" wrap>
         <ACol :span="24" :md="12" :lg="4">
           <AFormItem :label="$t('page.manage.user.userName')" name="userName" class="m-0">
-            <AInput v-model:value="model.userName" :placeholder="$t('page.manage.user.form.userName')" />
+            <AInput v-model:value="formModel.userName" :placeholder="$t('page.manage.user.form.userName')" />
           </AFormItem>
         </ACol>
         <ACol :span="24" :md="12" :lg="4">
           <AFormItem :label="$t('page.manage.user.phonenumber')" name="phonenumber" class="m-0">
-            <AInput v-model:value="model.phonenumber" :placeholder="$t('page.manage.user.form.phonenumber')" />
+            <AInput v-model:value="formModel.phonenumber" :placeholder="$t('page.manage.user.form.phonenumber')" />
           </AFormItem>
         </ACol>
         <ACol :span="24" :md="12" :lg="4">
           <AFormItem :label="$t('page.manage.user.status')" name="status" class="m-0">
-            <ASelect v-model:value="model.status" :placeholder="$t('page.manage.user.form.status')" allow-clear>
+            <ASelect v-model:value="formModel.status" :placeholder="$t('page.manage.user.form.status')" allow-clear>
               <ASelectOption v-for="option in enableStatusOptions" :key="option.value" :value="option.value">
                 {{ $t(option.label) }}
               </ASelectOption>
@@ -55,7 +63,7 @@ function search() {
           <!-- 部门 -->
           <AFormItem :label="$t('page.manage.user.dept')" name="deptId" class="m-0">
             <ATreeSelect
-              v-model:value="model.deptId"
+              v-model:value="formModel.deptId"
               :field-names="{ value: 'id' }"
               :placeholder="$t('page.manage.user.form.dept')"
               :tree-data="deptTreeData"