Haina
/
dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加确认日期

Browse Source
feature/2.0-sales-trade
YCC 2 years ago
parent 29d7ff93b8
commit 0f10a9d7ef
8 changed files with 6909 additions and 5608 deletions
Show Stats Download Patch File Download Diff File

12427
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
Unescape Escape View File

@ -11,7 +11,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",
"react-scripts": "^5.0.1",
"web-vitals": "^2.1.4",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.18.11/xlsx-0.18.11.tgz"
},

1
src/charts/Customer_care_inchina.js
Unescape Escape View File

@ -45,6 +45,7 @@ const Customer_care_inchina = () => {
onChange={inchina_data.onChange_datetype}>
<Radio value="applyDate">提交日期</Radio>
<Radio value="startDate">出发日期</Radio>
<Radio value="ConfirmDate">确认日期</Radio>
</Radio.Group>
<Button type="primary" icon={<SearchOutlined/>} loading={inchina_data.loading}
onClick={() => {

1
src/charts/Customer_care_potential.js
Unescape Escape View File

@ -44,6 +44,7 @@ const Customer_care_potential = () => {
onChange={potential_data.onChange_datetype}>
<Radio value="applyDate">预定日期</Radio>
<Radio value="startDate">出发日期</Radio>
<Radio value="ConfirmDate">确认日期</Radio>
</Radio.Group>
<Button type="primary" icon={<SearchOutlined/>} loading={potential_data.loading}
onClick={() => {

1
src/charts/Customer_care_regular.js
Unescape Escape View File

@ -44,6 +44,7 @@ const Customer_care_regular = () => {
onChange={regular_data.onChange_datetype}>
<Radio value="applyDate">预定日期</Radio>
<Radio value="startDate">出发日期</Radio>
<Radio value="ConfirmDate">确认日期</Radio>
</Radio.Group>
<Button type="primary" icon={<SearchOutlined/>} loading={regular_data.loading}
onClick={() => {

27
src/stores/CustomerStore.js
Unescape Escape View File

@ -17,12 +17,15 @@ class CustomerStore {
let url = '/service-tourdesign/PotentialCusOrder'
url += '?Website=' + this.potential_data.webcode + '&DEI_SNList=' + this.potential_data.groups.toString();
if (this.potential_data.date_type == 'applyDate') {
url += '&ApplydateCheck=1&EntrancedateCheck=0';
} else {
url += '&ApplydateCheck=0&EntrancedateCheck=1';
url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
} else if(this.potential_data.date_type == 'ConfirmDate'){
url += '&ApplydateCheck=0&EntrancedateCheck=0&ConfirmDateCheck=1';
}else {
url += '&ApplydateCheck=0&EntrancedateCheck=1&ConfirmDateCheck=0';
}
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';
url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
if (get_detail) {
url += '&IsDetail=1'
} else {
@ -87,12 +90,15 @@ class CustomerStore {
let url = '/service-tourdesign/RegularCusOrder'
url += '?Website=' + this.regular_data.webcode + '&DEI_SNList=' + this.regular_data.groups.toString();
if (this.regular_data.date_type == 'applyDate') {
url += '&ApplydateCheck=1&EntrancedateCheck=0';
} else {
url += '&ApplydateCheck=0&EntrancedateCheck=1';
url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
} else if(this.regular_data.date_type == 'ConfirmDate'){
url += '&ApplydateCheck=0&EntrancedateCheck=0&ConfirmDateCheck=1';
}else {
url += '&ApplydateCheck=0&EntrancedateCheck=1&ConfirmDateCheck=0';
}
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';
url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
if (get_detail) {
url += '&IsDetail=1'
} else {
@ -157,9 +163,11 @@ class CustomerStore {
let url = '/service-tourdesign/RegularCusInChinaOrder'
url += '?Website=' + this.inchina_data.webcode + '&DEI_SNList=' + this.inchina_data.groups.toString();
if (this.inchina_data.date_type == 'applyDate') {
url += '&ApplydateCheck=1&EntrancedateCheck=0';
} else {
url += '&ApplydateCheck=0&EntrancedateCheck=1';
url += '&ApplydateCheck=1&EntrancedateCheck=0&ConfirmDateCheck=0';
} else if(this.inchina_data.date_type == 'ConfirmDate'){
url += '&ApplydateCheck=0&EntrancedateCheck=0&ConfirmDateCheck=1';
}else {
url += '&ApplydateCheck=0&EntrancedateCheck=1&ConfirmDateCheck=0';
}
if (get_detail) {
url += '&IsDetail=1'
@ -168,6 +176,7 @@ 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';
url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59';
fetch(config.HT_HOST + url)
.then((response) => response.json())
.then((json) => {

12
src/stores/SaleStore.js
Unescape Escape View File

@ -18,6 +18,7 @@ class SaleStore {
group_select_mode = false;
groups = ["1,2,28,7"]; //默认GH事业部
site_select_mode = false; //是否多选站点
include_tickets = "1"; //是否包含门票，1是含有，0不含
webcode = "ALL";
date_type = "ConfirmDate";
ml_data = []; //毛利数据
@ -25,6 +26,11 @@ class SaleStore {
type_data_sub = []; //类型的子维度数据
date_title = "date_title"; //日期段，只用于显示，防止日期选择控件的变化导致页面刷新
//是否包含门票
handleChange_include_tickets = value => {
this.include_tickets = value;
};
//选择事业部
group_handleChange(value) {
this.groups = value;
@ -54,7 +60,7 @@ class SaleStore {
this.loading = true;
this.date_title = `${date1_start}~${date1_end}`;
let url = "/service-web/QueryData/GetDepartmentOrderML";
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&WebCode=${this.webcode}`;
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`;
url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`;
if (date2_start && date2_end) {
url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`;
@ -96,7 +102,7 @@ class SaleStore {
this.loading_table = true;
this.date_title = `${date1_start}~${date1_end}`;
let url = "/service-web/QueryData/GetDepartmentOrderMLByType";
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&OrderType=${this.active_tab_key}&WebCode=${this.webcode}`;
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&OrderType=${this.active_tab_key}&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`;
url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`;
if (date2_start && date2_end) {
url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`;
@ -327,7 +333,7 @@ class SaleStore {
const date2_start = comm.empty(date_moment.start_date_cp) ? "" : date_moment.start_date_cp.format(config.DATE_FORMAT);
const date2_end = comm.empty(date_moment.end_date_cp) ? "" : date_moment.end_date_cp.format(config.DATE_FORMAT);
let url = "/service-web/QueryData/GetDepartmentOrderMLByType_sub";
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&subType=${type_sub}&subTypeVal=-1&WebCode=${this.webcode}`;
url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&subType=${type_sub}&subTypeVal=-1&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`;
url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`;
if (date2_start && date2_end) {
url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`;

46
src/views/Sale.js
Unescape Escape View File

@ -91,7 +91,16 @@ const Sale = () => {
<Col md={24} lg={8} xxl={8}>
<SiteSelect store={sale_store} show_all={true} />
</Col>
<Col md={24} lg={8} xxl={8}></Col>
<Col md={24} lg={8} xxl={8}>
<Select style={{ width: "100%" }} placeholder="是否含门票" value={sale_store.include_tickets} onChange={sale_store.handleChange_include_tickets}>
<Select.Option key="1" value="1">
含门票
</Select.Option>
<Select.Option key="0" value="0">
不含门票
</Select.Option>
</Select>
</Col>
</Row>
<Row>
<Col md={24} lg={8} xxl={8}>
@ -113,6 +122,41 @@ const Sale = () => {
</Button>
</Col>
</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.Option key="3" value="3">
美国
</Select.Option>
<Select.Option key="5" value="5">
加拿大
</Select.Option>
<Select.Option key="7" value="7">
英国
</Select.Option>
<Select.Option key="18" value="18">
澳大利亚
</Select.Option>
</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.Option key="146001" value="146001">
夫妻
</Select.Option>
<Select.Option key="146002" value="146002">
家庭
</Select.Option>
<Select.Option key="146003" value="146003">
solo
</Select.Option>
<Select.Option key="146005" value="146005">
其他
</Select.Option>
</Select>
</Col>
</Row>
</Col>
</Row>

Write Preview
Loading…
Cancel
Save