From a6f7884e6e6085af219d61caf2e14d1da9d80241 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 24 Apr 2025 14:23:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=B8=89=E5=B3=A1:=20=E5=B8=B8?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=9C=B0=E6=8E=A5=E7=A4=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?;=20=0Bfix:=20=E5=9C=B0=E6=8E=A5=E7=A4=BE=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/search/SearchForm.jsx |  2 +-
 src/libs/ht.js                       | 11 +++++++++++
 src/stores/HotelCruise.js            |  3 ++-
 src/views/Cruise.jsx                 |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index d395c47..882d8d6 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -312,7 +312,7 @@ function getFields(props) {
       'agency',
       99,
       <Form.Item name={'agency'}>
-        <SearchInput autoGet url="/service-web/QueryData/GetVEIName" map={{ 'CAV_VEI_SN': 'key', 'VEI2_CompanyBN': 'label' }} resultkey={'result1'} placeholder="所有地接社" />
+        <SearchInput autoGet url="/service-web/QueryData/GetVEIName" map={{ 'CAV_VEI_SN': 'key', 'VEI2_CompanyBN': 'label' }} resultkey={'result1'} placeholder="所有地接社" {...fieldProps.agency} />
       </Form.Item>
     ),
     item(
diff --git a/src/libs/ht.js b/src/libs/ht.js
index 0855ffc..a9cd8ac 100644
--- a/src/libs/ht.js
+++ b/src/libs/ht.js
@@ -197,6 +197,17 @@ export const HotelStars = [
   { key: '13', value: '13', label: '豪华五星' },
 ];
 
+export const CruiseAgency = [
+  { key: '14193', value: '14193', label: '长江海外游轮旅游有限公司' },
+  { key: '1067', value: '1067', label: '湖北东方皇家游船公司(待删除)' },
+  { key: '70', value: '70', label: '湖北皇家长江旅游船有限公司' },
+  { key: '159', value: '159', label: '文嘉船务' },
+  { key: '77', value: '77', label: '武汉扬子江' },
+  { key: '1337', value: '1337', label: '重庆薇灿' },
+  { key: '4378', value: '4378', label: '重庆新世纪国旅' },
+  { key: '-1', value: '-1', label: '自订' },
+];
+
 /**
  * 计算指标值的分段区间
  * @param {number} value
diff --git a/src/stores/HotelCruise.js b/src/stores/HotelCruise.js
index 9ee9a23..0e4894c 100644
--- a/src/stores/HotelCruise.js
+++ b/src/stores/HotelCruise.js
@@ -64,6 +64,7 @@ const paramKeyMapped = {
   'DateDiff1': { key: 'CompareDateStart' },
   'DateDiff2': { key: 'CompareDateEnd' },
   'keyword': { key: 'ProductName' },
+  'agency': { key: 'VEI_SN' },
   'cruiseDirection': { key: 'Direction' },
   'cruiseBookType': { key: 'BookingType' },
   'hotelStar': { key: 'Star' },
@@ -85,7 +86,7 @@ class HotelCruise {
     const _queryParam = objectMapper(param, paramKeyMapped);
     const queryParam = omit({ ...this.searchValuesToSub, ..._queryParam }, [
       'DepartmentList', 'orderStatus', 'keyword', 'Date1', 'Date2', 'DateDiff1', 'DateDiff2',
-      'cruiseDirection', 'cruiseBookType', 'country'
+      'cruiseDirection', 'cruiseBookType', 'country', 'agency',
     ]);
     queryParam.Compare = isEmpty(param.DateDiff1) ? '' : '1';
     const res = await fetchCruiseData(queryParam);
diff --git a/src/views/Cruise.jsx b/src/views/Cruise.jsx
index 076bb15..901c94a 100644
--- a/src/views/Cruise.jsx
+++ b/src/views/Cruise.jsx
@@ -5,6 +5,7 @@ import moment from 'moment';
 import { Row, Col, Table, Select, Space, Typography, Progress, Spin, Divider, Button, Switch } from 'antd';
 import SearchForm from './../components/search/SearchForm';
 import { VSTag, TableExportBtn } from './../components/Data';
+import { CruiseAgency } from './../libs/ht';
 
 const {Text} = Typography;
 
@@ -91,6 +92,7 @@ export default observer((props) => {
                 DepartmentList: { show_all: true, mode: 'multiple' },
                 orderStatus: { show_all: true },
                 cruiseDirection: { show_all: true },
+                agency: { defaultOptions: CruiseAgency, autoGet: false },
                 // years: { hide_vs: false },
               },
             }}