Skip to content

J
jinfa-platform
Commit b54c0c37 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

Merge branch 'dev' into test

parents b78a59d6 e0d66d1f
Hide whitespace changes
Inline Side-by-side
Showing with 533 additions and 330 deletions
src/pages/logistics/components/orderSearchDetail.tsx
View file @ b54c0c37
...@@ -303,19 +303,19 @@ const detailInfo: React.FC<{}> = () => { ...@@ -303,19 +303,19 @@ const detailInfo: React.FC<{}> = () => {
</div> </div>
</> </>
} }
extra={ // extra={
dataInfo.status === 2 && // dataInfo.status === 2 &&
<> // <>
<Button onClick={() => setvisible(true)}> // <Button onClick={() => setvisible(true)}>
<StopOutlined /> // <StopOutlined />
不接受物流单 // 不接受物流单
</Button> // </Button>
<Button onClick={() => setvisible(true)} className={style['saveBtn']}> // <Button onClick={() => setvisible(true)} className={style['saveBtn']}>
<CheckSquareOutlined /> // <CheckSquareOutlined />
接受物流单 // 接受物流单
</Button> // </Button>
</> // </>
} // }
content={ content={
<div className={style['headerMain']}> <div className={style['headerMain']}>
<div className={style['headerMain-left']}> <div className={style['headerMain-left']}>
......
src/pages/logistics/components/orderSearchList.tsx
View file @ b54c0c37
...@@ -18,6 +18,12 @@ import { timeRange } from '@/utils/index' ...@@ -18,6 +18,12 @@ import { timeRange } from '@/utils/index'
import statuStyle from '../colorTag' import statuStyle from '../colorTag'
import { TimeList, statusList, outSideStatusList } from '../statusList' import { TimeList, statusList, outSideStatusList } from '../statusList'
import moment from 'moment' import moment from 'moment'
import { LogisticsOrderSearchSchema, confirmLogisticsOrderSearchSchema } from '../components/schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import NiceForm from '@/components/NiceForm';
import { createFormActions } from '@formily/antd';
const formActions = createFormActions();
let { Option } = Select let { Option } = Select
export interface listProps { export interface listProps {
title?: ReactNode, title?: ReactNode,
...@@ -323,8 +329,13 @@ const orderSearchList: React.FC<listProps> = (props) => { ...@@ -323,8 +329,13 @@ const orderSearchList: React.FC<listProps> = (props) => {
setSearchForm({ ...searchForm }) setSearchForm({ ...searchForm })
ref.current.reload({ ...searchForm }) ref.current.reload({ ...searchForm })
} }
const search = (values: any) => {
ref.current.reload(values)
}
return ( return (
<PageHeaderWrapper title='快递单查询'> <PageHeaderWrapper>
<Card> <Card>
<StandardTable <StandardTable
tableProps={{ rowKey: 'id' }} tableProps={{ rowKey: 'id' }}
...@@ -335,105 +346,15 @@ const orderSearchList: React.FC<listProps> = (props) => { ...@@ -335,105 +346,15 @@ const orderSearchList: React.FC<listProps> = (props) => {
fetchTableData={(params: any) => fetchData(params)} fetchTableData={(params: any) => fetchData(params)}
rowClassName="editable-row" rowClassName="editable-row"
controlRender={ controlRender={
<> <NiceForm
<Row> actions={formActions}
<Col span={12}> onSubmit={values => search(values)}
<Tooltip trigger={['focus']} placement='top' effects={($, actions) => {
title={'输入物流单号进行搜索'}> useStateFilterSearchLinkageEffect($, actions, 'logisticsOrderNo', FORM_FILTER_PATH)
<Input.Search }}
style={{ width: '232px' }} schema={props.type === '1' ? confirmLogisticsOrderSearchSchema : LogisticsOrderSearchSchema}
value={searchForm.logisticsOrderNo} >
placeholder='搜索' </NiceForm>
onChange={(e) => setSearchForm({ ...searchForm, logisticsOrderNo: e.target.value })}
onSearch={(val) => handleChange('logisticsOrderNo', val)}
/>
</Tooltip>
<Button className={style['filter-btn']} onClick={() => setIsSearch(isSearch = !isSearch)}>
高级筛选{isSearch ? <UpOutlined /> : <DownOutlined />}
</Button>
<Button className={style.selectBtn} onClick={() => handleReset()}>重置</Button>
</Col>
</Row>
<Row style={{ margin: '16px 0' }}>
{
isSearch &&
<Col>
<Space size={16}>
{
props.type === '1' ?
<>
<Input.Search
style={{ width: '232px' }}
value={searchForm.invoicesNo}
placeholder='输入对应单号进行搜索'
onChange={(e) => setSearchForm({ ...searchForm, invoicesNo: e.target.value })}
onSearch={(val) => handleChange('invoicesNo', val)}
/>
<Select
className={style.select}
showSearch
value={searchForm.companyId}
onChange={(val) => handleChange('companyId', val)}
optionFilterProp='children'
filterOption={(input, option) =>
option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
>
<Option value=''>物流服务商(全部)</Option>
{
companyList.map((item, index) => {
return <Option value={item.id}>{item.name}</Option>
})
}
</Select>
</>
:
<Select
className={style.select}
showSearch
value={searchForm.shipperId}
onChange={(val) => handleChange('shipperId', val)}
optionFilterProp='children'
filterOption={(input, option) =>
option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
>
<Option value=''>发货方(全部)</Option>
{
shipperAddressList.map((item, index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
}
<Select
className={style.select}
value={TimeRange}
onChange={(val) => {
setTimeRange(val),
setSearchForm({
...searchForm,
invoicesTimeStart: timeRange(val).st,
invoicesTimeEnd: timeRange(val).et
})
}
}
>
{
TimeList.map((item, index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
</Space>
</Col>
}
</Row>
</>
} }
/> />
......
src/pages/logistics/components/schema.ts
View file @ b54c0c37
...@@ -57,7 +57,7 @@ export const deliveryNumberSchema: ISchema = { ...@@ -57,7 +57,7 @@ export const deliveryNumberSchema: ISchema = {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
placeholder: '单据时间（全部）', placeholder: '单据时间',
} }
}, },
submit: { submit: {
...@@ -73,7 +73,6 @@ export const deliveryNumberSchema: ISchema = { ...@@ -73,7 +73,6 @@ export const deliveryNumberSchema: ISchema = {
} }
} }
} }
// 选择订货单 // 选择订货单
export const orderNumberSchema: ISchema = { export const orderNumberSchema: ISchema = {
type: 'object', type: 'object',
...@@ -119,21 +118,21 @@ export const orderNumberSchema: ISchema = { ...@@ -119,21 +118,21 @@ export const orderNumberSchema: ISchema = {
placeholder: '单据选择' placeholder: '单据选择'
}, },
enum: [ enum: [
{label: '询价采购', value: 1}, { label: '询价采购', value: 1 },
{label: '需求采购', value: 2}, { label: '需求采购', value: 2 },
{label: '现货采购', value: 3}, { label: '现货采购', value: 3 },
{label: '集采', value: 4}, { label: '集采', value: 4 },
{label: '积分兑换', value: 5}, { label: '积分兑换', value: 5 },
{label: '渠道直采', value: 6}, { label: '渠道直采', value: 6 },
{label: '渠道现货', value: 7}, { label: '渠道现货', value: 7 },
{label: '渠道积分兑换', value: 8}, { label: '渠道积分兑换', value: 8 },
] ]
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
placeholder: '单据时间（全部）', placeholder: '单据时间',
} }
}, },
submit: { submit: {
...@@ -148,4 +147,373 @@ export const orderNumberSchema: ISchema = { ...@@ -148,4 +147,373 @@ export const orderNumberSchema: ISchema = {
} }
} }
} }
}
// 物流单处理 - 待确认物流单
export const confirmLogisticsOrderSchema: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
properties: {
logisticsOrderNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {},
"x-component-props": {
placeholder: '物流单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'flex-start',
flexWrap: 'nowrap'
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
shipperId: {
type: 'string',
"x-component-props": {
placeholder: '发货方',
},
},
status: {
type: 'string',
"x-component-props": {
placeholder: '外部状态'
},
enum: [
{ label: '待提交', value: 1 },
{ label: '待确认', value: 2 },
{ label: '不接受物流单', value: 3 },
{ label: '接受物流单', value: 4 },
]
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间',
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
// 物流单处理 - 物流单查询
export const LogisticsOrderSearchSchema: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
properties: {
logisticsOrderNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {},
"x-component-props": {
placeholder: '物流单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'flex-start',
flexWrap: 'nowrap'
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
shipperId: {
type: 'string',
"x-component-props": {
placeholder: '发货方',
},
},
status: {
type: 'string',
"x-component-props": {
placeholder: '外部状态',
style: {
width: 160
}
},
enum: [
{ label: '待提交', value: 1 },
{ label: '待确认', value: 2 },
{ label: '不接受物流单', value: 3 },
{ label: '接受物流单', value: 4 },
]
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间',
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
// 物流单提交 - 物流单查询
export const confirmLogisticsOrderSearchSchema: ISchema = {
type: 'object',
properties: {
megalayout: {
type: 'object',
"x-component": 'mega-layout',
properties: {
logisticsOrderNo: {
type: 'string',
"x-component": "Search",
"x-mega-props": {},
"x-component-props": {
placeholder: '物流单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]: {
type: 'object',
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'flex-start',
flexWrap: 'nowrap'
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
PRO_LAYOUT: {
type: 'object',
"x-component": 'mega-layout',
"x-mega-props": {
span: 5
},
"x-component-props": {
inline: true
},
properties: {
invoicesNo: {
type: 'string',
"x-component-props": {
placeholder: '对应订单号',
},
},
status: {
type: 'string',
"x-component-props": {
placeholder: '外部状态',
style: {
width: 160
}
},
enum: [
{ label: '待提交', value: 1 },
{ label: '待确认', value: 2 },
{ label: '不接受物流单', value: 3 },
{ label: '接受物流单', value: 4 },
]
},
companyId: {
type: 'string',
"x-component": 'SearchSelect',
"x-component-props": {
placeholder: '物流服务商',
className: 'fixed-ant-selected-down',
fetchSearch: PublicApi.getLogisticsSelectListCompany,
style: {
width: 160
}
},
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间',
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
// 物流单提交 - 待提交物流单
export const submitLogisticsOrderSchema: ISchema = {
type:'object',
properties:{
megalayout:{
type:'object',
"x-component":'mega-layout',
"x-component-props":{
grid:true
},
properties:{
ctl:{
type:'object',
"x-component":"Children",
"x-component-props":{
children:"{{controllerBtns}}"
}
},
logisticsOrderNo:{//报价单号
type:'string',
"x-component":"Search",
"x-mega-props":{},
"x-component-props":{
placeholder:'物流单号'
}
}
}
},
[FORM_FILTER_PATH]:{
type:'object',
"x-component":"flex-layout",
"x-component-props":{
rowStyle:{
flexWrap:'nowrap'
},
colStyle:{
marginLeft: 20
}
},
properties:{
PRO_LAYOUT:{
type:'object',
"x-component":'mega-layout',
"x-mega-props":{
span: 5
},
"x-component-props":{
inline: true
},
properties:{
invoicesNo:{
type:'string',
"x-component-props":{
placeholder:'对应订单号'
}
},
companyId: {
type: 'string',
"x-component": 'SearchSelect',
"x-component-props": {
placeholder: '物流服务商',
className: 'fixed-ant-selected-down',
fetchSearch: PublicApi.getLogisticsSelectListCompany,
style: {
width: 160
}
},
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间',
}
},
status: {
type: 'string',
"x-component-props": {
placeholder: '外部状态',
style: {
width: 160
}
},
enum: [
{ label: '待提交', value: 1 },
{ label: '待确认', value: 2 },
{ label: '不接受物流单', value: 3 },
{ label: '接受物流单', value: 4 },
]
},
}
},
sumbit:{
"x-component":'Submit',
"x-mega-props":{
span:1
},
"x-component-props":{
children:'查询'
}
}
}
}
}
} }
\ No newline at end of file
src/pages/logistics/list/company.tsx
View file @ b54c0c37
...@@ -113,12 +113,16 @@ const Company: React.FC<{}> = () => { ...@@ -113,12 +113,16 @@ const Company: React.FC<{}> = () => {
const title = `确定要${status}吗?` const title = `确定要${status}吗?`
return ( return (
<> <>
<Button disabled={record.status !== 0} type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/company/edit?id=${record.id}`)}>编辑</Button> {record.status === 0 &&
<Popconfirm disabled={record.status !== 0} title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete(record.id)}> <>
<Button disabled={record.status !== 0} type='link'> <Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/company/edit?id=${record.id}`)}>编辑</Button>
删除 <Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete(record.id)}>
<Button type='link'>
删除
</Button> </Button>
</Popconfirm> </Popconfirm>
</>
}
</> </>
) )
} }
......
src/pages/logistics/list/components/templateForm.tsx
View file @ b54c0c37
...@@ -190,8 +190,9 @@ const diaLogForm: React.FC<ListProps> = (props) => { ...@@ -190,8 +190,9 @@ const diaLogForm: React.FC<ListProps> = (props) => {
// provic: '广东省', // provic: '广东省',
pricingMode: '1', pricingMode: '1',
transportMode: '1', transportMode: '1',
designateList: [{}] designateList: [{}],
}} }}
previewPlaceholder=' '
onSubmit={(values) => FormSumbit(values)} onSubmit={(values) => FormSumbit(values)}
components={{ components={{
Input, Select, TextArea: Input.TextArea, Switch, Radio, Input, Select, TextArea: Input.TextArea, Switch, Radio,
......
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
View file @ b54c0c37
...@@ -25,11 +25,17 @@ import { StandardTable } from 'god' ...@@ -25,11 +25,17 @@ import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface' import { ColumnType } from 'antd/lib/table/interface'
import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController' import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { timeRange} from '@/utils/index' import { timeRange } from '@/utils/index'
import moment from 'moment' import moment from 'moment'
import statuStyle from '../colorTag' import statuStyle from '../colorTag'
import {TimeList,outSideStatusList,statusList} from '../statusList' import { TimeList, outSideStatusList, statusList } from '../statusList'
import style from '../components/index.less' import style from '../components/index.less'
import { confirmLogisticsOrderSchema } from '../components/schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import NiceForm from '@/components/NiceForm';
import { createFormActions } from '@formily/antd';
const formActions = createFormActions();
const { Option } = Select const { Option } = Select
const data = [ const data = [
{ {
...@@ -144,7 +150,7 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -144,7 +150,7 @@ const OrderList: React.FC<ListProps> = (props) => {
invoicesTimeStart: '', invoicesTimeStart: '',
invoicesTimeEnd: '' invoicesTimeEnd: ''
}) })
const columns: ColumnType<any>[] = [ const columns: ColumnType<any>[] = [
{ {
title: '物流单号', title: '物流单号',
...@@ -195,7 +201,7 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -195,7 +201,7 @@ const OrderList: React.FC<ListProps> = (props) => {
align: 'center', align: 'center',
dataIndex: 'invoicesTime', dataIndex: 'invoicesTime',
key: 'invoicesTime', key: 'invoicesTime',
render: (text:any) => <>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</> render: (text: any) => <>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</>
}, },
{ {
title: '外部状态', title: '外部状态',
...@@ -204,7 +210,7 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -204,7 +210,7 @@ const OrderList: React.FC<ListProps> = (props) => {
key: 'status', key: 'status',
filters: statusList, filters: statusList,
filterMultiple: false, filterMultiple: false,
onFilter:(value,record) => record.status === value, onFilter: (value, record) => record.status === value,
render: (text: any, record: any) => { render: (text: any, record: any) => {
let component: ReactNode = null let component: ReactNode = null
if (text == 3) { if (text == 3) {
...@@ -296,7 +302,10 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -296,7 +302,10 @@ const OrderList: React.FC<ListProps> = (props) => {
ref.current.reload() ref.current.reload()
} }
// 搜索
const search = (values: any) => {
ref.current.reload(values)
}
const onCancel = () => { const onCancel = () => {
setvisible(false) setvisible(false)
} }
...@@ -308,64 +317,16 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -308,64 +317,16 @@ const OrderList: React.FC<ListProps> = (props) => {
columns={columns} columns={columns}
currentRef={ref} currentRef={ref}
fetchTableData={(params: any) => fetchData(params)} fetchTableData={(params: any) => fetchData(params)}
rowClassName="editable-row"
formilyChilds={{
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/list/addressForm?addType=${props.type}`)}>新建</Button>
</>
)
}}
controlRender={ controlRender={
<> <NiceForm
<Row> actions={formActions}
<Col span={12}> onSubmit={values => search(values)}
<Tooltip trigger={['focus']} placement='top' effects={($, actions) => {
title={props.type === '1' ? '输入物流单号、订单号进行搜索' : '输入物流单号、发货方进行搜索'}> useStateFilterSearchLinkageEffect($, actions, 'logisticsOrderNo', FORM_FILTER_PATH)
<Input.Search }}
style={{ width: '232px' }} schema={confirmLogisticsOrderSchema}
value={searchForm.logisticsOrderNo} >
placeholder='搜索' </NiceForm>
onChange={(e) => setSearchForm({ ...searchForm, logisticsOrderNo: e.target.value })}
onSearch={() => handleSearch}
/>
</Tooltip>
<Button className={style['filter-btn']} onClick={() => setIsSearch(isSearch = !isSearch)}>
高级筛选{isSearch ? <UpOutlined /> : <DownOutlined />}
</Button>
<Button className={style.selectBtn} onClick={() => handleReset()}>重置</Button>
</Col>
</Row>
<Row style={{ margin: '16px 0' }}>
{
isSearch &&
<Col>
<Space size={16}>
<Select
className={style.select}
value={TimeRange}
onChange={(val) => {
setTimeRange(val),
setSearchForm({
...searchForm,
invoicesTimeStart: timeRange(val).st,
invoicesTimeEnd: timeRange(val).et
})
}
}
>
{
TimeList.map((item,index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
</Space>
</Col>
}
</Row>
</>
} }
/> />
<ConfirmModal <ConfirmModal
......
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
View file @ b54c0c37
...@@ -30,6 +30,12 @@ import {TimeList,outSideStatusList,statusList} from '../statusList' ...@@ -30,6 +30,12 @@ import {TimeList,outSideStatusList,statusList} from '../statusList'
import moment from 'moment' import moment from 'moment'
import { timeRange } from '@/utils/index' import { timeRange } from '@/utils/index'
import Index from '@/pages'; import Index from '@/pages';
import { submitLogisticsOrderSchema } from '../components/schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import NiceForm from '@/components/NiceForm';
import { createFormActions } from '@formily/antd';
const formActions = createFormActions();
let { Option } = Select let { Option } = Select
const data = [ const data = [
{ {
...@@ -315,7 +321,17 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -315,7 +321,17 @@ const OrderList: React.FC<ListProps> = (props) => {
setSearchForm(obj) setSearchForm(obj)
ref.current.reload(obj) ref.current.reload(obj)
} }
// 搜索
const search = (values: any) => {
ref.current.reload(values)
}
const controllerBtns = <Row>
<Col span={24}>
<Space direction="horizontal" size={16}>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/add`)}>新建</Button>
</Space>
</Col>
</Row>
return ( return (
<PageHeaderWrapper> <PageHeaderWrapper>
<Card> <Card>
...@@ -326,96 +342,16 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -326,96 +342,16 @@ const OrderList: React.FC<ListProps> = (props) => {
fetchTableData={(params: any) => fetchData(params)} fetchTableData={(params: any) => fetchData(params)}
rowClassName="editable-row" rowClassName="editable-row"
controlRender={ controlRender={
<> <NiceForm
<Row> actions={formActions}
<Col span={8}> onSubmit={values => search(values)}
<Button effects={($, actions) => {
type="primary" useStateFilterSearchLinkageEffect($, actions, 'logisticsOrderNo', FORM_FILTER_PATH)
onClick={() => }}
history.push('/memberCenter/logisticsAbility/logisticsSubmit/toOrderSumitList/add') expressionScope={{controllerBtns}}
} schema={submitLogisticsOrderSchema}
> >
<PlusOutlined /> </NiceForm>
新建
</Button>
</Col>
<Col span={10}
offset={6}
style={{ textAlign: 'right' }}
>
<Tooltip trigger={['focus']} placement='top'
title='输入物流单号、订单号进行搜索'>
<Input.Search
style={{ width: '232px' }}
value={searchForm.logisticsOrderNo}
placeholder='搜索'
onChange={(e) => setSearchForm({ ...searchForm, logisticsOrderNo: e.target.value })}
onSearch={(val) => handleChange('logisticsOrderNo', val)}
/>
</Tooltip>
<Button className={style['filter-btn']} onClick={() => setIsSearch(isSearch = !isSearch)}>
高级筛选{isSearch ? <UpOutlined /> : <DownOutlined />}
</Button>
<Button className={style.selectBtn} onClick={() => handleReset()}>重置</Button>
<Row style={{ margin: '16px 0' }}>
{
isSearch &&
<Col
offset={2}
span={22}
>
<Space size={16}>
<Input.Search
style={{ width: '232px' }}
value={searchForm.invoicesNo}
placeholder='输入对应单号进行搜索'
onChange={(e) => setSearchForm({ ...searchForm, invoicesNo: e.target.value })}
onSearch={(val) => handleChange('invoicesNo', val)}
/>
<Select
className={style.select}
value={searchForm.companyId}
showSearch
onChange={(val) => handleChange('companyId', val)}
optionFilterProp='children'
filterOption={(input, option) =>
option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
>
<Option value=''>物流服务商(全部)</Option>
{
companyList.map((item, index) => {
return <Option key={index} value={item.id}>{item.name}</Option>
})
}
</Select>
<Select
className={style.select}
value={TimeRange}
onChange={(val) => {
setTimeRange(val),
setSearchForm({
...searchForm,
invoicesTimeStart: timeRange(val).st,
invoicesTimeEnd: timeRange(val).et
})
}}
>
{
TimeList.map((item, index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
</Space>
</Col>
}
</Row>
</Col>
</Row>
</>
} }
/> />
</Card> </Card>
......
src/pages/transaction/enquiryOffer/components/productModal.tsx
View file @ b54c0c37
...@@ -48,7 +48,7 @@ const layout = { ...@@ -48,7 +48,7 @@ const layout = {
* @return {type} * @return {type}
*/ */
const fetchData = async (params) => { const fetchData = async (params) => {
const res = await PublicApi.getProductCommodityCommonGetCommodityListBySeller({ ...params, priceTypeList: [1, 2], environment: 1, shopType: 1 }) const res = await PublicApi.getProductCommodityCommonGetCommodityListBySeller({ ...params, priceTypeList: 2, environment: 1, shopType: 1 })
return res.data return res.data
} }
...@@ -152,16 +152,20 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => { ...@@ -152,16 +152,20 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
const handleSelectOk = () => { const handleSelectOk = () => {
const selectRow = productRowCtl.selectRow[0] const selectRow = productRowCtl.selectRow[0]
let { commodityId, id, customerCategoryName, goodsId, roleId, name, brandName } = selectRow if (selectRow) {
Curform.setFieldsValue({ let { commodityId, id, customerCategoryName, goodsId, roleId, name, brandName } = selectRow
productName: name,//商品名称 Curform.setFieldsValue({
brand: brandName, productName: name,//商品名称
category: customerCategoryName, brand: brandName,
productId: id category: customerCategoryName,
}) productId: id
//查询属性 })
GetCommodityAttribute(id) //查询属性
setsVisible(false) GetCommodityAttribute(id)
setsVisible(false)
}
} }
const handleSelectCancel = () => { const handleSelectCancel = () => {
setsVisible(false) setsVisible(false)
...@@ -241,6 +245,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => { ...@@ -241,6 +245,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
确定 确定
</Button> </Button>
] ]
const { ...restProps } = props
return ( return (
<> <>
<Modal <Modal
...@@ -415,8 +420,8 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => { ...@@ -415,8 +420,8 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
tableProps={{ tableProps={{
rowKey: 'id' rowKey: 'id'
}} }}
> forceRender={visible}
</ModalTable> />
</> </>
) )
} }
......
src/pages/transaction/enquiryOffer/toAddSubmit/index.tsx
View file @ b54c0c37
...@@ -64,14 +64,14 @@ const List:React.FC<{}> = () => { ...@@ -64,14 +64,14 @@ const List:React.FC<{}> = () => {
key:'quotationNo', key:'quotationNo',
dataIndex:'quotationNo', dataIndex:'quotationNo',
align:'center', align:'center',
render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/rfq/preview?id=${record.id}`}>{text}</EyePreview> render:(text:any, record:any) => <EyePreview url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/rfq/preview?id=${record.id}`}>{text}</EyePreview>
}, },
{ {
title:'需求单号', title:'需求单号',
key:'requisitionFormNo', key:'requisitionFormNo',
dataIndex:'requisitionFormNo', dataIndex:'requisitionFormNo',
align:'center', align:'center',
render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview?id=${record.requisitionId}`}>{text}</EyePreview> render:(text:any, record:any) => <EyePreview url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview?id=${record.requisitionId}`}>{text}</EyePreview>
}, },
{ {
title:'报价单摘要', title:'报价单摘要',
......
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
View file @ b54c0c37
...@@ -1034,6 +1034,10 @@ const Detail: React.FC<{}> = () => { ...@@ -1034,6 +1034,10 @@ const Detail: React.FC<{}> = () => {
setaddres(option) setaddres(option)
} }
const disabledDate = (current) => {
return current && current < moment().endOf('day');
}
return ( return (
<PageHeaderWrapper <PageHeaderWrapper
onBack={() => history.goBack()} onBack={() => history.goBack()}
...@@ -1219,7 +1223,9 @@ const Detail: React.FC<{}> = () => { ...@@ -1219,7 +1223,9 @@ const Detail: React.FC<{}> = () => {
]} ]}
name="deliveryTime" name="deliveryTime"
> >
<DatePicker style={{ width: '100%' }} /> <DatePicker style={{ width: '100%' }}
disabledDate={disabledDate}
/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
initialValue={initialValues.addresId} initialValue={initialValues.addresId}
...@@ -1250,7 +1256,12 @@ const Detail: React.FC<{}> = () => { ...@@ -1250,7 +1256,12 @@ const Detail: React.FC<{}> = () => {
]} ]}
name="quotationAsTime" name="quotationAsTime"
> >
<DatePicker showTime format="YYYY-MM-DD HH:mm" style={{ width: '100%' }} /> <DatePicker
showTime
format="YYYY-MM-DD HH:mm"
style={{ width: '100%' }}
disabledDate={disabledDate}
/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
initialValue={initialValues.offer} initialValue={initialValues.offer}
......
src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx
View file @ b54c0c37
...@@ -29,15 +29,18 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -29,15 +29,18 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
}; };
// 会员添加弹窗控制 // 会员添加弹窗控制
const [visibleChannelMember, setVisibleChannelMember] = useState(false); const [visibleChannelMember, setVisibleChannelMember] = useState(false);
const [goodsList, setgoodsList] = useState([]); const [goodsList, setgoodsList] = useState<any>([]);
const [inquiryGoods, setinquiryGoods] = useState<any>([]);
const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' }); const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' });
const [customerCategory, setcustomerCategory] = useState([]); const [customerCategory, setcustomerCategory] = useState<any>([]);
const [brand, setbrand] = useState([]); const [brand, setbrand] = useState<any>([]);
const handleOkAddMember = () => { const handleOkAddMember = () => {
setVisibleChannelMember(false); setVisibleChannelMember(false);
const arr: any[] = [] const arr: any[] = [];
const inquiry: any[] = [];
memberRowCtl.selectRow.forEach((v, i) => { memberRowCtl.selectRow.forEach((v, i) => {
inquiry.push(v)
arr.push({ arr.push({
productId: v.id, productId: v.id,
productName: v.name, productName: v.name,
...@@ -47,9 +50,10 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -47,9 +50,10 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
purchaseCount: 1 purchaseCount: 1
}) })
setgoodsList(arr) setinquiryGoods(inquiry);
getGoodsList(arr) setgoodsList(arr);
}) getGoodsList(arr);
});
} }
const handleCancelAddMember = () => { const handleCancelAddMember = () => {
setVisibleChannelMember(false) setVisibleChannelMember(false)
...@@ -225,8 +229,13 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -225,8 +229,13 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
newData.splice(colIndex, 1) newData.splice(colIndex, 1)
// 删除选中的项 // 删除选中的项
memberRowCtl.setSelectRow(newData) const selectData = [...inquiryGoods];
memberRowCtl.setSelectedRowKeys(newData.map(v => v.productId)) const idx = selectData.findIndex(v => v.id === record.productId);
console.log(newData, selectData);
console.log(colIndex, idx);
selectData.splice(idx, 1)
memberRowCtl.setSelectRow(selectData)
memberRowCtl.setSelectedRowKeys(selectData.map(v => v.id))
setgoodsList(newData) setgoodsList(newData)
} }
......
src/pages/transaction/goodsOffer/addEnquiryOrder/details.tsx
View file @ b54c0c37
...@@ -7,19 +7,6 @@ const AddEnquiryOrderDatails:React.FC<{}> = () => { ...@@ -7,19 +7,6 @@ const AddEnquiryOrderDatails:React.FC<{}> = () => {
//type: 1.待提交询价单,2.待审核询价单1级,3.待审核询价单2级,4.询价单查询,5.询价单查询,6.待新增报价单 //type: 1.待提交询价单,2.待审核询价单1级,3.待审核询价单2级,4.询价单查询,5.询价单查询,6.待新增报价单
//view: 1.询价单号,2.报价单号 //view: 1.询价单号,2.报价单号
const { id } = history.location.query; const { id } = history.location.query;
const { pathname } = history.location;
const last = pathname.split('/')[pathname.split('/').length - 1];
const type = pathname.split('/')[pathname.split('/').length - 2];
const [view, setview] = useState<Number>(1);
if(last === 'details') {
// 代表是进来提交审核
} else if(type === 'rfq') {
// 代表的是查看询价
} else if(type === 'quote') {
// 代表的是查看报价
}
return( return(
<Datails <Datails
page_type={6} page_type={6}
......
src/pages/transaction/goodsOffer/components/details.tsx
View file @ b54c0c37
...@@ -33,7 +33,8 @@ const Details: React.FC<parmas> = (props) => { ...@@ -33,7 +33,8 @@ const Details: React.FC<parmas> = (props) => {
//view: 1.询价单号,2.报价单号 //view: 1.询价单号,2.报价单号
//action: 审核按钮 //action: 审核按钮
const { id, page_type, view, action } = props; const { id, page_type, view, action } = props;
console.log(action) const { pathname } = history.location;
const last = pathname.split('/')[pathname.split('/').length - 1];
const [headerWrapperData, setheaderWrapperData] = useState<Array<any>>([]); const [headerWrapperData, setheaderWrapperData] = useState<Array<any>>([]);
const format = (text) => { const format = (text) => {
return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</> return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
...@@ -314,7 +315,7 @@ const Details: React.FC<parmas> = (props) => { ...@@ -314,7 +315,7 @@ const Details: React.FC<parmas> = (props) => {
extra={ extra={
<> <>
{ {
(action && (Number(page_type) === 2 || Number(page_type) === 3) && (data.interiorState === 2 || data.interiorState === 3)) && (last==='details' && (Number(page_type) === 2 || Number(page_type) === 3) && (data.interiorState === 2 || data.interiorState === 3)) &&
<> <>
<Button type='primary' className={style['saveBtn']} onClick={() => { setvisible(true) }}> <Button type='primary' className={style['saveBtn']} onClick={() => { setvisible(true) }}>
<CheckSquareOutlined />单据审核 <CheckSquareOutlined />单据审核
...@@ -322,7 +323,7 @@ const Details: React.FC<parmas> = (props) => { ...@@ -322,7 +323,7 @@ const Details: React.FC<parmas> = (props) => {
</> </>
} }
{ {
( action && Number(page_type) === 6 && data.interiorState === 1) && ( last==='details' && Number(page_type) === 6 && data.interiorState === 1) &&
<Button className={style['saveBtn']} onClick={() => setvisible(true)}> <Button className={style['saveBtn']} onClick={() => setvisible(true)}>
<CheckSquareOutlined />提交 <CheckSquareOutlined />提交
</Button> </Button>
......
src/pages/transaction/goodsOffer/schema/index.tsx
View file @ b54c0c37
...@@ -28,9 +28,7 @@ export const commonEnquieryOfferSchema: ISchema = { ...@@ -28,9 +28,7 @@ export const commonEnquieryOfferSchema: ISchema = {
inquiryListNo:{//报价单号 inquiryListNo:{//报价单号
type:'string', type:'string',
"x-component":"Search", "x-component":"Search",
"x-mega-props":{ "x-mega-props":{},
},
"x-component-props":{ "x-component-props":{
placeholder:'询价单号' placeholder:'询价单号'
} }
......
src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx
View file @ b54c0c37
...@@ -64,7 +64,7 @@ const EnquiryOrder: React.FC<{}> = (props) => { ...@@ -64,7 +64,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
title: '操作', title: '操作',
key: 'options', key: 'options',
dataIndex: 'options', dataIndex: 'options',
render: (text: any, record: any) => <Button type='link'><Link to={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/quote?id=${record.id}`}>报价</Link></Button> render: (text: any, record: any) => <Button disabled={record.externalState!==2 && record.externalState!==5} type='link'><Link to={`/memberCenter/tranactionAbility/inquiryQuote/addInquiryOrder/quote?id=${record.id}`}>报价</Link></Button>
}]; }];
//交易能力 询价报价 询价单查询 //交易能力 询价报价 询价单查询
const fetchData = (params?: any) => { const fetchData = (params?: any) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment