diff --git a/src/App.jsx b/src/App.jsx
index 718dd76..6d61367 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -124,15 +124,15 @@ const App = () => {
},
{ key: 'kpi', label: 目标, icon: },
{ key: 'distribution', label: 统计分布, icon: },
- {
- key: 'detail',
- label: (
-
- 统计分析
-
- ),
- icon: ,
- },
+ // {
+ // key: 'detail',
+ // label: (
+ //
+ // 统计分析
+ //
+ // ),
+ // icon: ,
+ // },
];
return (
diff --git a/src/components/kpi/ObjectPanel.jsx b/src/components/kpi/ObjectPanel.jsx
index ba7ab01..1d83680 100644
--- a/src/components/kpi/ObjectPanel.jsx
+++ b/src/components/kpi/ObjectPanel.jsx
@@ -8,7 +8,7 @@ const searchFormItemSet = {
'bu': { shows: ['DateType', 'years', 'HTBusinessUnits'], sort },
'dept': { shows: ['DateType', 'years', 'DepartmentList'], sort, fieldProps: { DepartmentList: { allowClear: true,isLeaf: true, show_all: false } }, },
'operator': { shows: ['DateType', 'years', 'DepartmentList', 'operator'], fieldProps: { DepartmentList: { allowClear: true, isLeaf: true }, operator: { param: { } } }, sort }, // is_assign: 1
- 'destination': { shows: ['DateType', 'years', 'destination'], sort },
+ 'destination': { shows: ['DateType', 'years', 'city'], sort }, // 'country', , 'globalCity'
'country': { shows: ['DateType', 'years', 'country'], sort },
};
diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index e8051c4..e6bac4f 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -142,6 +142,11 @@ export default observer((props) => {
transform: (value) => value?.key || '',
default: '',
},
+ 'city': {
+ key: 'city',
+ transform: (value) => value?.key || '',
+ default: '',
+ },
};
let dest = {};
const { applyDate, applyDate2, year, yearDiff, ...omittedValue } = values;
@@ -327,6 +332,20 @@ function getFields(props) {
),
+ item(
+ 'city',
+ 99,
+
+
+
+ ),
+ item(
+ 'globalCity',
+ 99,
+
+
+
+ ),
];
baseChildren = baseChildren
.map((x) => {
diff --git a/src/libs/ht.js b/src/libs/ht.js
index df28874..75d70d0 100644
--- a/src/libs/ht.js
+++ b/src/libs/ht.js
@@ -66,7 +66,8 @@ export const sites = [
{ value: '163', key: '163', label: 'GH', code: 'GH' },
{ value: '28', key: '28', label: '客运中国', code: 'GHKYZG' },
{ value: '7', key: '7', label: '客运海外', code: 'GHKYHW' },
- { value: '172', key: '172', label: 'GH TO B业务', code: 'GHTOB' },
+ { value: '172', key: '172', label: 'GHToB 海外', code: 'GHTOBHW' },
+ { value: '176', key: '176', label: 'GHToB 中国', code: 'GHTOBZG' },
{ value: '11,12,20,21,10,18', key: '11,12,20,21,10,18', label: '国际(入境)', code: 'JP,VAC,IT,GM,RU,VC' },
{ value: '122,200,211,100,188', key: '122,200,211,100,188', label: '国际(海外)', code: 'VACHW,ITHW,GMHW,RUHW,VCHW' },
{ value: '11', key: '11', label: '日语', code: 'JP' },
@@ -135,8 +136,9 @@ export const KPIObjects = [
{ key: 'dept', value: 'dept', label: '小组', data: leafGroup },
{ key: 'du', value: 'du', label: '销售小组', data: deptUnits },
{ key: 'operator', value: 'operator', label: '顾问' },
- { key: 'destination', value: 'destination', label: '目的地' },
- { key: 'country', value: 'country', label: '国籍' },
+ { key: 'destination', value: 'destination', label: '目的地 城市' },
+ // { key: 'destination', value: 'destination', label: '目的地 国籍' },
+ { key: 'country', value: 'country', label: '客源 国籍' },
{
key: 'guestgrouptype',
value: 'guestgrouptype',
diff --git a/src/stores/CustomerServices.js b/src/stores/CustomerServices.js
index 8ad1619..dba1f48 100644
--- a/src/stores/CustomerServices.js
+++ b/src/stores/CustomerServices.js
@@ -342,6 +342,16 @@ class CustomerServices {
dataIndex: 'TotalCost'
}
]
+ },
+ {
+ title: '报价',
+ dataIndex: 'TotalPrice',
+ sorter: (a, b) => a.TotalPrice - b.TotalPrice,
+ children: [{
+ title: total1.totalprice,
+ dataIndex: 'TotalPrice'
+ }
+ ]
}
];
});
diff --git a/src/views/KPI.jsx b/src/views/KPI.jsx
index 7ab7e3d..294358e 100644
--- a/src/views/KPI.jsx
+++ b/src/views/KPI.jsx
@@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from 'react';
import { stores_Context } from './../config';
import { observer } from 'mobx-react';
import { Row, Col, Tabs, Spin } from 'antd';
-import { flush, isEmpty, objectMapper } from './../utils/commons';
+import { flush, isEmpty, objectMapper, pick } from './../utils/commons';
import { KPIObjects } from './../libs/ht';
import ObjectPanel from '../components/kpi/ObjectPanel';
import OverviewPanel from './../components/kpi/OverviewPanel';
@@ -19,12 +19,12 @@ const objectComponents = {
'country': ObjectPanel,
};
const objectFilterKey = {
- 'bu': 'HTBusinessUnits',
- 'dept': 'DepartmentList',
+ 'bu': ['HTBusinessUnits'],
+ 'dept': ['DepartmentList'],
// 'du': 'du',
// 'operator': 'operator',
- // 'destination': 'destination',
- 'country': 'country',
+ 'destination': ['city', ],
+ 'country': ['country'],
};
export default observer((props) => {
const { KPIStore, DictDataStore, date_picker_store: searchFormStore } = useContext(stores_Context);
@@ -80,11 +80,9 @@ export default observer((props) => {
// KPIStore.getList(getkpiParam).then((data) => {
// // setDataSource(data);
if (objectFilterKey?.[curObject]) {
- const selectItem = searchFormStore.formValues[objectFilterKey[curObject]];
- if (selectItem) {
- selectItem.value = selectItem.key;
- }
- setRetObjects(flush([selectItem]));
+ const selectItems = Object.values(pick(searchFormStore.formValues, objectFilterKey[curObject]));
+ const _selectItems = flush(selectItems).map((ele) => ({ ...ele, value: ele.key }));
+ setRetObjects(_selectItems);
}
// });
};