From 312a3b68e707435fd25596bf0a9a46e1d198b2ee Mon Sep 17 00:00:00 2001
From: YCC <ycc@hainatravel.com>
Date: Mon, 7 Aug 2023 09:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=84=E7=A7=8D=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                |  2 +-
 src/charts/GroupSelect.js |  1 +
 src/charts/SiteSelect.js  |  7 +++++--
 src/stores/SaleStore.js   | 14 ++++++++++++--
 src/views/Sale.js         |  9 +++++----
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/App.js b/src/App.js
index f209d8f..07f93a2 100644
--- a/src/App.js
+++ b/src/App.js
@@ -87,7 +87,7 @@ const App = () => {
 				}}>
 				<Sider collapsible={true} breakpoint="lg">
 					<Image src={Logo} preview={false} />
-					<Menu theme="dark" defaultSelectedKeys={["1"]} defaultOpenKeys={["2", "5"]} mode="inline" items={menu_items} />
+					<Menu theme="dark" defaultSelectedKeys={["1"]} defaultOpenKeys={["2", "5"]}  mode="inline" items={menu_items} />
 				</Sider>
 				<Layout className="site-layout">
 					<Content
diff --git a/src/charts/GroupSelect.js b/src/charts/GroupSelect.js
index a1cace1..729bb32 100644
--- a/src/charts/GroupSelect.js
+++ b/src/charts/GroupSelect.js
@@ -26,6 +26,7 @@ class GroupSelect extends Component {
                     <Select.Option key="1" value="1">CH直销</Select.Option>
                     <Select.Option key="2" value="2">CH大客户</Select.Option>
                     <Select.Option key="28" value="28">AH亚洲项目组</Select.Option>
+                    <Select.Option key="33" value="33">GH项目组</Select.Option>
                     <Select.Option key="7" value="7">市场推广</Select.Option>
                     <Select.Option key="8" value="8">德语</Select.Option>
                     <Select.Option key="9" value="9">日语</Select.Option>
diff --git a/src/charts/SiteSelect.js b/src/charts/SiteSelect.js
index bdda6fe..809c21d 100644
--- a/src/charts/SiteSelect.js
+++ b/src/charts/SiteSelect.js
@@ -23,10 +23,13 @@ class SiteSelect extends Component {
                     {this.props.show_all ? <Select.Option key="1" value="ALL">所有来源</Select.Option> : ''}
                     <Select.Option key="2" value="CHT">CHT</Select.Option>
                     <Select.Option key="8" value="AH">AH</Select.Option>
-                    <Select.Option key="9" value="GH">GH</Select.Option>
+                    <Select.Option key="163" value="GH">GH</Select.Option>
                     <Select.Option key="28" value="GHKYZG">客运中国</Select.Option>
                     <Select.Option key="7" value="GHKYHW">客运海外</Select.Option>
-                    <Select.Option key="11" value="JP">日语JP</Select.Option>
+                    <Select.Option key="172" value="GHTOB">GH to B业务</Select.Option>
+                    <Select.Option key="11,12,20,21,10,18" value="JP,VAC,IT,GM,RU,VC">国际（入境）</Select.Option>
+                    <Select.Option key="122,200,211,100,188" value="VACHW,ITHW,GMHW,RUHW,VCHW">国际（海外）</Select.Option>
+                    <Select.Option key="11" value="JP">日语</Select.Option>
                     <Select.Option key="12" value="VAC">西语</Select.Option>
                     <Select.Option key="122" value="VACHW">西语海外</Select.Option>
                     <Select.Option key="20" value="IT">意大利</Select.Option>
diff --git a/src/stores/SaleStore.js b/src/stores/SaleStore.js
index 274df54..f5be931 100644
--- a/src/stores/SaleStore.js
+++ b/src/stores/SaleStore.js
@@ -17,6 +17,8 @@ class SaleStore {
 	active_tab_key = "All"; //当前选择的标签
 	group_select_mode = false;
 	groups = ["1,2,28,7"]; //默认GH事业部
+	filter_country=[];//筛选国籍
+	filter_guest_type=[];//筛选客户关系
 	site_select_mode = false; //是否多选站点
 	include_tickets = "1"; //是否包含门票，1是含有，0不含
 	webcode = "ALL";
@@ -50,6 +52,15 @@ class SaleStore {
 		this.date_type = value;
 	}
 
+	//选择客源国
+	onChange_Country(value) {
+		this.filter_country = value;
+	}
+	//选择成员关系
+	onChange_GuestGroupType(value) {
+		this.filter_guest_type = value;
+	}
+
 	//获取业绩信息
 	get_department_order_ml(date_moment) {
 		let result = [];
@@ -324,7 +335,7 @@ class SaleStore {
 			});
 	}
 
-	//子维度查询 beign
+	//子维度查询
 	get_department_order_ml_by_type_sub(date_moment, type_sub) {
 		this.spinning = true;
 		let result = { dataSource: [], columns: [] };
@@ -402,7 +413,6 @@ class SaleStore {
 			});
 	}
 
-	//子维度查询 end
 }
 
 export default SaleStore;
diff --git a/src/views/Sale.js b/src/views/Sale.js
index 313a703..5c67c3a 100644
--- a/src/views/Sale.js
+++ b/src/views/Sale.js
@@ -123,9 +123,9 @@ const Sale = () => {
 						</Col>
 					</Row>
 
-					<Row>
+					{/* <Row>
 						<Col md={24} lg={12} xxl={12}>
-							<Select mode="multiple" style={{ width: "100%" }} placeholder="筛选国籍" value={sale_store.groups} onChange={value => sale_store.group_handleChange(value)} allowClear={true}>
+							<Select mode="multiple" style={{ width: "100%" }} placeholder="筛选国籍" value={sale_store.filter_country} onChange={value => sale_store.onChange_Country(value)} allowClear={true}>
 								<Select.Option key="3" value="3">
 									美国
 								</Select.Option>
@@ -141,7 +141,7 @@ const Sale = () => {
 							</Select>
 						</Col>
 						<Col md={24} lg={12} xxl={12}>
-							<Select mode="multiple" style={{ width: "100%" }} placeholder="筛选出行目的" value={sale_store.groups} onChange={value => sale_store.group_handleChange(value)} allowClear={true}>
+							<Select mode="multiple" style={{ width: "100%" }} placeholder="成员关系" value={sale_store.filter_guest_type} onChange={value => sale_store.onChange_GuestGroupType(value)} allowClear={true}>
 								<Select.Option key="146001" value="146001">
 									夫妻
 								</Select.Option>
@@ -156,7 +156,8 @@ const Sale = () => {
 								</Select.Option>
 							</Select>
 						</Col>
-					</Row>
+					</Row> */}
+
 				</Col>
 			</Row>