diff --git a/src/stores/CustomerServices.js b/src/stores/CustomerServices.js index 26f18b8..1e05bc3 100644 --- a/src/stores/CustomerServices.js +++ b/src/stores/CustomerServices.js @@ -462,6 +462,7 @@ class CustomerServices { searchValues = { DateType: { key: 'departureDate', label: '抵达日期'}, + // departureDateType: { key: 'departureDate', label: '抵达日期'}, }; setSearchValues(obj, values) { diff --git a/src/views/AgentGroupCount.jsx b/src/views/AgentGroupCount.jsx index e391fba..211243a 100644 --- a/src/views/AgentGroupCount.jsx +++ b/src/views/AgentGroupCount.jsx @@ -46,6 +46,9 @@ const AgentGroupCount = () => { 地接社团信息 + + + { pagination={false} scroll={{ x: 1000 }} /> - - - diff --git a/src/views/AgentGroupList.jsx b/src/views/AgentGroupList.jsx index 1a23268..545c8ac 100644 --- a/src/views/AgentGroupList.jsx +++ b/src/views/AgentGroupList.jsx @@ -32,12 +32,12 @@ const AgentGroupList = () => { ...date_picker_store.formValues, ...customerServicesStore.searchValues, }, - shows: ['DateType', 'DepartmentList', 'dates'], + shows: ['departureDateType', 'DepartmentList', 'dates'], fieldProps: { DepartmentList: { show_all: true }, WebCode: { show_all: false, mode: 'multiple' }, dates: { hide_vs: true }, - DateType: { disabledKeys: ['applyDate'] }, + departureDateType: { disabledKeys: ['applyDate'] }, }, }} onSubmit={(_err, obj, form, str) => { diff --git a/src/views/DestinationGroupCount.jsx b/src/views/DestinationGroupCount.jsx index 790a0e1..5c305c4 100644 --- a/src/views/DestinationGroupCount.jsx +++ b/src/views/DestinationGroupCount.jsx @@ -44,6 +44,9 @@ const DestinationGroupCount = () => { 目的地团信息 + + +
{ pagination={false} scroll={{ x: 1000 }} /> - - - diff --git a/src/views/DestinationGroupList.jsx b/src/views/DestinationGroupList.jsx index 7dbf37b..0e27fad 100644 --- a/src/views/DestinationGroupList.jsx +++ b/src/views/DestinationGroupList.jsx @@ -33,13 +33,13 @@ const DestinationGroupList = () => { countryArea: { key: 'china', label: '国内' }, ...customerServicesStore.searchValues, }, - shows: ['DateType', 'DepartmentList', 'dates'], + shows: ['departureDateType', 'DepartmentList', 'dates'], fieldProps: { DepartmentList: { show_all: true }, orderStatus: { show_all: true }, countryArea: { show_all: false }, dates: { hide_vs: true }, - DateType: { disabledKeys: ['applyDate'] }, + departureDateType: { disabledKeys: ['applyDate'] }, }, }} onSubmit={(_err, obj, form) => {