diff --git a/src/charts/MobileDeal.jsx b/src/charts/MobileDeal.jsx
index c3c3c18..329adbe 100644
--- a/src/charts/MobileDeal.jsx
+++ b/src/charts/MobileDeal.jsx
@@ -1,41 +1,45 @@
-import React, {Component} from 'react';
-import {Table, Button, Space, Radio} from 'antd';
-import {SearchOutlined} from '@ant-design/icons';
-import GroupSelect from '../components/search/GroupSelect';
-import DatePickerCharts from "../components/search/DatePickerCharts";
-import {stores_Context} from "../config";
-import {observer} from "mobx-react";
+import React, { Component } from 'react';
+import { Table, } from 'antd';
+import SearchForm from './../components/search/SearchForm';
+import { stores_Context } from '../config';
+import { observer } from 'mobx-react';
class MobileDeal extends Component {
- static contextType = stores_Context;
+ static contextType = stores_Context;
- constructor(props) {
- super(props);
- }
+ constructor(props) {
+ super(props);
+ }
- render() {
- const {dashboard_store} = this.context;
- const mobile_data = dashboard_store.mobile_data;
- return (
-
-
移动成交
-
-
-
-
-
- 预定日期
- 出发日期
-
-
-
-
-
-
- );
- }
+ render() {
+ const { dashboard_store, date_picker_store } = this.context;
+ const mobile_data = dashboard_store.mobile_data;
+ return (
+
+
移动成交
+
{
+ dashboard_store.setMobileSearchValues(obj, form);
+ mobile_data.asyncFetch();
+ }}
+ />
+
+
+ );
+ }
}
export default observer(MobileDeal);
diff --git a/src/components/search/DataTypeSelect.jsx b/src/components/search/DataTypeSelect.jsx
index 9d199ba..9d30117 100644
--- a/src/components/search/DataTypeSelect.jsx
+++ b/src/components/search/DataTypeSelect.jsx
@@ -35,7 +35,7 @@ class DataTypeSelect extends Component {
{...extProps}
>
{dateTypes.map((ele) => (
-
+
{ele.label}
))}
diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index 464ea44..e03074c 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -221,7 +221,7 @@ export default observer((props) => {
{getFields({ sort, initialValue, hides, shows, fieldProps, form })}
{/* 'textAlign': 'right' */}
-
+
} htmlType="submit">
{confirmText || '统计'}
@@ -312,7 +312,7 @@ function getFields(props) {
rules={[{ required: true, message: '选择小组' }]}
>
-
+ , fieldProps?.DepartmentList?.col
),
item(
'WebCode',
@@ -378,9 +378,9 @@ function getFields(props) {
'DateType',
99,
-
+
,
- 3
+ fieldProps?.DateType?.col || 3
),
item(
'years',
@@ -405,7 +405,7 @@ function getFields(props) {
,
- midCol
+ fieldProps?.dates?.col || midCol
),
item(
'operator',
diff --git a/src/stores/DashboardStore.js b/src/stores/DashboardStore.js
index 52b44ce..cd56116 100644
--- a/src/stores/DashboardStore.js
+++ b/src/stores/DashboardStore.js
@@ -1,6 +1,7 @@
import { makeAutoObservable, runInAction } from "mobx";
import * as config from "../config";
import { resultDataCb } from '../components/DateGroupRadio/date';
+import { groupsMappedByKey } from './../libs/ht';
class DashboardStore {
constructor(rootStore) {
@@ -197,7 +198,17 @@ class DashboardStore {
group_handleChange: this.handleChange_group_select.bind(this),
onChange_datetype: this.onChange_datetype.bind(this),
asyncFetch: this.get_CountYDOrder.bind(this),
+
+ mobileSearchValues: {
+ 'DateType': { key: 'applyDate', value: 'applyDate', label: '预定日期'},
+ 'DepartmentList': ["1", "2", "28", "7", "8", "9", "11", "12", "20", "21", "18"].map(ele => groupsMappedByKey[ele] ),
+ }
};
+
+ setMobileSearchValues(obj, values) {
+ this.mobile_data.date_type = obj.DateType;
+ this.mobile_data.groups = obj.DepartmentList;
+ }
// 移动成交 end
// 汇率变化 begin