diff --git a/src/App.jsx b/src/App.jsx
index 61b1f2f..ea6132d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -231,6 +231,7 @@ const App = () => {
}>
} />
} />
+ } />
}>
} />
diff --git a/src/stores/FinancialStore.js b/src/stores/FinancialStore.js
index 5f27970..b6bc94e 100644
--- a/src/stores/FinancialStore.js
+++ b/src/stores/FinancialStore.js
@@ -137,6 +137,12 @@ class FinancialStore {
* 服务人数页面 ----
*/
+ serviceModelMapper = {
+ 'inbound': { url: '/service-Analyse2/inbound_person_num', keySort: true, dynamicsX: false },
+ 'outbound': { url: '/service-Analyse2/outbound_person_num', keySort: true, dynamicsX: false },
+ 'domestic': { url: '/service-Analyse2/domestic_person_num', keySort: true, dynamicsX: false },
+ };
+
servicePersonNum = { curTab: 'inbound',
'inbound': { loading: false, dataSource: [], total: {} },
'outbound': { loading: false, dataSource: [], total: {} },
@@ -151,12 +157,17 @@ class FinancialStore {
* 获取服务人数
*/
async getPersonNum(queryData) {
+ const mkey = this.servicePersonNum.curTab;
+ const url = this.serviceModelMapper[mkey].url;
+
this.servicePersonNum[this.servicePersonNum.curTab].loading = true;
- const json = await fetchJSON('/inbound_person_num/test', queryData);
+ const json = await fetchJSON(url, {...queryData, DateType: 'confirmDate'});
+ const totalRow = {...json.resultTotal, groupsKey: `total${mkey}`};
+ const IndividualServiceRow = {orgz: json.resultTotal.IndividualService, groupsKey: `individualService${mkey}`, groupsLabel: '单项服务人数', };
if (json.errcode === 0) {
runInAction(() => {
this.servicePersonNum[this.servicePersonNum.curTab].loading = false;
- this.servicePersonNum[this.servicePersonNum.curTab].dataSource = [].concat([json.resultTotal], json.result);
+ this.servicePersonNum[this.servicePersonNum.curTab].dataSource = [].concat([IndividualServiceRow, totalRow], json.result);
this.servicePersonNum[this.servicePersonNum.curTab].total = json.resultTotal;
});
}
diff --git a/src/views/ServicePersonNum.jsx b/src/views/ServicePersonNum.jsx
index 0fbd783..4664229 100644
--- a/src/views/ServicePersonNum.jsx
+++ b/src/views/ServicePersonNum.jsx
@@ -3,6 +3,7 @@ import { observer } from 'mobx-react';
import { stores_Context } from '../config';
import { Spin, Table, Row, Col, Tabs } from 'antd';
import SearchForm from './../components/search/SearchForm';
+import { TableExportBtn } from './../components/Data';
import './kpi.css';
const apartOptions = [
@@ -50,7 +51,7 @@ export default observer((props) => {
...formValues,
DateType: { key: 'startDate', value: 'startDate', label: '走团日期' },
},
- shows: ['DateType', 'dates'],
+ shows: ['dates'],
fieldProps: {
dates: { hide_vs: true },
},
@@ -69,6 +70,9 @@ export default observer((props) => {
financialStore.setCurTab(v);
pageRefresh();
}}
+ tabBarExtraContent={{
+ right: ,
+ }}
type="card"
items={apartOptions.map((ele) => {
return {
@@ -78,7 +82,7 @@ export default observer((props) => {