{text == 1 ? '成行' : '未成行'},
+ sorter: (a, b) => b.OrderState - a.OrderState,
+ },
+ {
+ title: '毛利',
+ dataIndex: 'ML',
+ key: 'ML',
+ },
+ {
+ title: '人数',
+ dataIndex: 'PersonNum',
+ key: 'PersonNum',
+ },
+ {
+ title: '天数',
+ dataIndex: 'COLI_Days',
+ key: 'COLI_Days',
+ },
+ {
+ title: '人天数',
+ dataIndex: 'CGI_PersonDays',
+ key: 'CGI_PersonDays',
+ },
+ {
+ title: '走团日期',
+ dataIndex: 'COLI_OrderStartDate',
+ key: 'COLI_OrderStartDate',
+ },
+ {
+ title: '小组',
+ dataIndex: 'Department',
+ key: 'Department',
+ },
+ {
+ title: '老客户',
+ dataIndex: 'COLI_IsOld',
+ key: 'COLI_IsOld',
+ },
+ {
+ title: '老客户推荐',
+ dataIndex: 'COLI_IsCusCommend',
+ key: 'COLI_IsCusCommend',
+ },
+ {
+ title: '网站',
+ dataIndex: 'COLI_WebCode',
+ key: 'COLI_WebCode',
+ },
+ {
+ title: '来源',
+ dataIndex: 'SourceType',
+ key: 'SourceType',
+ },
+ {
+ title: '在华',
+ dataIndex: 'ZH',
+ key: 'ZH',
+ },
+ ]
+ } size="small"
+ rowKey={record => record.COLI_ID}
+ />
diff --git a/src/charts/DatePickerCharts.js b/src/charts/DatePickerCharts.js
index 3537fc5..fa03019 100644
--- a/src/charts/DatePickerCharts.js
+++ b/src/charts/DatePickerCharts.js
@@ -3,6 +3,8 @@ import {Col, DatePicker, Row} from 'antd';
import {observer} from 'mobx-react';
import * as config from "../config";
import moment from "moment";
+import 'moment/locale/zh-cn';
+import locale from 'antd/es/date-picker/locale/zh_CN';
import {stores_Context} from "../config";
//用于日期选择，计算上一时间段、同比时间等
@@ -11,6 +13,12 @@ class DatePickerCharts extends Component {
constructor(props) {
super(props);
+ //设置全局日期为中国
+ moment.locale("zh-cn", {
+ week: {
+ dow: 1 //周一是每周的第一天
+ }
+ });
}
@@ -20,7 +28,7 @@ class DatePickerCharts extends Component {
-
{this.props.hide_vs ? '' :
- response.json())
.then((json) => {
runInAction(() => {
- if (this.potential_data.show_detail) {
+ if (get_detail) {
this.potential_data.data_detail = json;
} else {
this.potential_data.data = json;
}
this.potential_data.loading = false;
- this.potential_data.loading_detail = false;
})
})
.catch((error) => {
this.potential_data.loading = false;
- this.potential_data.loading_detail = false;
console.log('fetch data failed', error);
});
}
@@ -69,9 +64,6 @@ class CustomerStore {
potential_data = {
loading: false,
- loading_detail: false,
- show_detail: false,
- show_detail_table: false,
data: [],
data_detail: [],
webcode: 'GHKYHW',
@@ -88,9 +80,9 @@ class CustomerStore {
// 潜力客户 end
-
// 老客户 beign
- regular_customer_order() {
+ regular_customer_order(get_detail = false) {
+ this.regular_data.loading = true;
const date_picker_store = this.rootStore.date_picker_store;
let url = '/service-tourdesign/RegularCusOrder'
url += '?Website=' + this.regular_data.webcode + '&DEI_SNList=' + this.regular_data.groups.toString();
@@ -101,30 +93,25 @@ class CustomerStore {
}
url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
- if (this.regular_data.show_detail) {
+ if (get_detail) {
url += '&IsDetail=1'
- this.regular_data.loading_detail = true;
- this.regular_data.show_detail_table = true;
} else {
url += '&IsDetail=0'
- this.regular_data.loading = true;
}
fetch(config.HT_HOST + url)
.then((response) => response.json())
.then((json) => {
runInAction(() => {
- if (this.regular_data.show_detail) {
+ if (get_detail) {
this.regular_data.data_detail = json;
} else {
this.regular_data.data = json;
}
this.regular_data.loading = false;
- this.regular_data.loading_detail = false;
})
})
.catch((error) => {
this.regular_data.loading = false;
- this.regular_data.loading_detail = false;
console.log('fetch data failed', error);
});
}
@@ -147,9 +134,6 @@ class CustomerStore {
regular_data = {
loading: false,
- loading_detail: false,
- show_detail: false,
- show_detail_table: false,
data: [],
data_detail: [],
webcode: 'ALL',
@@ -166,8 +150,9 @@ class CustomerStore {
// 老客户 end
- // 老客户 beign
- inchina_customer_order() {
+ // 在华客人 beign
+ inchina_customer_order(get_detail = false) {
+ this.inchina_data.loading = true;
const date_picker_store = this.rootStore.date_picker_store;
let url = '/service-tourdesign/RegularCusOrder'
url += '?Website=' + this.inchina_data.webcode + '&DEI_SNList=' + this.inchina_data.groups.toString();
@@ -176,32 +161,27 @@ class CustomerStore {
} else {
url += '&ApplydateCheck=0&EntrancedateCheck=1';
}
- url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
- url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
- if (this.inchina_data.show_detail) {
+ if (get_detail) {
url += '&IsDetail=1'
- this.inchina_data.loading_detail = true;
- this.inchina_data.show_detail_table = true;
} else {
url += '&IsDetail=0'
- this.inchina_data.loading = true;
}
+ url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
+ url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
fetch(config.HT_HOST + url)
.then((response) => response.json())
.then((json) => {
runInAction(() => {
- if (this.inchina_data.show_detail) {
+ if (get_detail) {
this.inchina_data.data_detail = json;
} else {
this.inchina_data.data = json;
}
this.inchina_data.loading = false;
- this.inchina_data.loading_detail = false;
})
})
.catch((error) => {
this.inchina_data.loading = false;
- this.inchina_data.loading_detail = false;
console.log('fetch data failed', error);
});
}
@@ -224,9 +204,6 @@ class CustomerStore {
inchina_data = {
loading: false,
- loading_detail: false,
- show_detail: false,
- show_detail_table: false,
data: [],
data_detail: [],
webcode: 'ALL',
@@ -240,7 +217,7 @@ class CustomerStore {
onChange_show_detail_table: this.onChange_show_detail_table_inchina.bind(this),
handleChange_webcode: this.handleChange_webcode_inchina.bind(this),
}
-// 老客户 end
+// 在华客人 end
}