From b7d7c863199abdc79a63c36d356c2d2cbbdc7f8d Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Mon, 8 Jul 2024 16:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=90=9C=E7=B4=A2=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Account.js            | 4 ++--
 src/views/account/Management.jsx | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/stores/Account.js b/src/stores/Account.js
index 47abc92..2b5e8d8 100644
--- a/src/stores/Account.js
+++ b/src/stores/Account.js
@@ -139,16 +139,16 @@ const useAccountStore = create((set, get) => ({
   },
 
   searchAccountByCriteria: async (formValues) => {
-
+    const travel_agency_ids = formValues.agency.map((ele) => ele.key).join(',')
     const searchParams = {
       username: formValues.username,
       realname: formValues.realname,
+      travel_agency_ids: travel_agency_ids,
       lgc: 2
     }
 
     const resultArray = await fetchAccountList(searchParams)
 
-    console.info(resultArray)
     const mapAccoutList = resultArray.map((r) => {
       return {
         accountId: r.wu_id,
diff --git a/src/views/account/Management.jsx b/src/views/account/Management.jsx
index bb00571..06e631b 100644
--- a/src/views/account/Management.jsx
+++ b/src/views/account/Management.jsx
@@ -324,12 +324,13 @@ function Management() {
         <Title level={3}>{t('account:accountList')}</Title>
         <SearchForm
           fieldsConfig={{
-            shows: ['username', 'realname'],
+            shows: ['username', 'realname', 'agency'],
             fieldProps: {
               username: { label: t('account:username') },
               realname: { label: t('account:realname') },
+              agency: { label: t('account:travelAgency') },
             },
-            sort: { username: 1, realname: 2},
+            sort: { username: 1, realname: 2, agency: 3},
           }}
           onSubmit={() => {
             handelAccountSearch()