Skip to content

J
jinfa-platform
Commit ed7914cf authored by LeeJiancong's avatar LeeJiancong
Browse files
Options

优化.对接物流明细

parent 52187b79
Expand all Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 171 deletions
src/pages/logistics/components/orderSearchDetail.tsx
View file @ ed7914cf
......@@ -38,9 +38,9 @@ interface dataInfoType{
}
const detailInfo: React.FC<{}> = () => {
const ref = useRef({})
const ref = useRef<any>({})
let [isextraOption, setIsextraOption] = useState(false)
let [dataInfo, setdataInfo] = useState<dataInfoType>({
let [dataInfo, setdataInfo] = useState<any>({
status: '',
digest: '',
logisticsOrderNo:'',
......@@ -54,7 +54,7 @@ const detailInfo: React.FC<{}> = () => {
freightPrice: 0,
settlementWay: ''
})
const [id, setid] = useState('')
const [id, setid] = useState(history.location.query.id)
let [visible, setvisible] = useState(false)
const [pagination, setPagination] = useState({
current: 1,
......@@ -179,19 +179,24 @@ const detailInfo: React.FC<{}> = () => {
{
title: '状态',
dataIndex: 'status',
align: 'center',
align: 'left',
key: 'status',
render: (text: any, record: any) => {
render: (text: number, record: any) => {
let component: ReactNode = null;
component = <Badge color="#FFC400" text="待审核" />;
text === 1 ? component = <Badge status='default' text="待提交" />:
text === 2 ? component = <Badge status='processing' text="待确认" />:
text === 3 ? component = <Badge status='success' text="接受物流单" />:
component = <Badge status='error' text="不接受物流单" />
return component;
},
},
{
title: '操作',
dataIndex: 'operation',
dataIndex: 'type',
align: 'center',
key: 'operation',
key: 'type',
render: (text: number ,record:any) =>
<>{text === 1 ?'提交物流单':'确认物流单'}</>
},
{
title: '操作时间',
......@@ -208,6 +213,7 @@ const detailInfo: React.FC<{}> = () => {
width: 300
},
];
//在这做逻辑判断 判断路由 是由哪个页面进来的
useEffect(() => {
let pathname = history.location.pathname
......@@ -243,12 +249,15 @@ const detailInfo: React.FC<{}> = () => {
//待确认物流单
if (pathname === '/memberCenter/logisticsAbility/logisticsResult/toOrderComfirmDeatil') {
setIsextraOption(true)
PublicApi.getLogisticsOrderWaitConfirmGet({ id: id }).then(res => {
setdataInfo(res.data)
let current = 0
if(res.data.status <= 2){
if(res.data.status == 1){
current = 0
}else if(res.data.status == 2){
current = 0
setIsextraOption(true)
}else if(res.data.status == 3 || res.data.status == 4){
current = 1
}
......@@ -261,17 +270,27 @@ const detailInfo: React.FC<{}> = () => {
}, [])
const fetchData = (params: any) => {
return new Promise((resolve, reject) => {
const queryResult = data.find(v => v.key === params.keywords);
setTimeout(() => {
resolve({
code: 200,
message: '',
data: dataInfo.detailList//dataInfo.logList
});
}, 1000);
PublicApi.getLogisticsOrderWaitSubmitPageOrderLog({...params,orderId:id}).then(res => {
if(res.code === 1000){
resolve(res.data)
}
})
// const queryResult = data.find(v => v.key === params.keywords);
// setTimeout(() => {
// resolve({
// code: 200,
// message: '',
// data: dataInfo.detailList//dataInfo.logList
// });
// }, 1000);
});
};
const handleModalOK = () => {
setvisible(false)
ref.current.reload()
}
return (
<PageHeaderWrapper
......@@ -364,7 +383,7 @@ const detailInfo: React.FC<{}> = () => {
(item: any, index: number) => {
return (
<div className={style['cols-main']} key={index}>
<div className={style['cols-main-options']}>
<div className={style['cols-main-options']} style={{flex:'1.5 1'}}>
{item.title}
</div>
<div className={style['cols-main-options']}>
......@@ -485,7 +504,14 @@ const detailInfo: React.FC<{}> = () => {
<div className={style['mainCol-title']}>
外部流转记录
</div>
<Table dataSource={dataInfo.logList} columns={columns} pagination={pagination} />
<StandardTable
tableProps={{rowKey:'id'}}
currentRef={ref}
columns={columns}
fetchTableData={(params: any) => fetchData(params)}
/>
{/* <Table dataSource={dataInfo.logList} columns={columns} pagination={pagination} /> */}
</Col>
......@@ -494,6 +520,7 @@ const detailInfo: React.FC<{}> = () => {
id={id}
dialogVisible={visible}
onCancel={() => setvisible(false)}
onOK = {() =>handleModalOK}
/>
</PageHeaderWrapper>
......
src/pages/logistics/components/sumbitOrderModal.tsx
View file @ ed7914cf
import React, { Component, useState, useEffect,useRef } from 'react';
import { Modal, Button, Form,Row,Col,Tooltip,Input,Select } from 'antd'
import {UpOutlined, DownOutlined} from '@ant-design/icons'
import {StandardTable} from 'god'
import { ColumnType,TableRowSelection} from 'antd/lib/table/interface'
import React, { Component, useState, useEffect, useRef } from 'react';
import { Modal, Button, Form, Row, Col, Tooltip, Input, Select, Space } from 'antd'
import { UpOutlined, DownOutlined } from '@ant-design/icons'
import { StandardTable } from 'god'
import { ColumnType, TableRowSelection } from 'antd/lib/table/interface'
import style from '../components/index.less'
import { PublicApi} from '@/services/api'
let {Option} = Select
import { PublicApi } from '@/services/api'
let { Option } = Select
export interface Params {
title: string;
type: number,
type: number,//1 选择订单 2发货单 3选择商品
columns: Array<any>;
dialogVisible: boolean;
onCancel: Function;
......@@ -17,10 +17,10 @@ export interface Params {
interface Item {
key: string;
}
interface filterItem{
interface filterItem {
name?: string;
brandName?:string;
customerCategory?:string,
brandName?: string;
customerCategory?: string,
status?: any
}
......@@ -30,75 +30,75 @@ const listDialog: React.FC<Params> = (props) => {
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
let [isSearch, setIsSearch] = useState(false)
let [filterParams, setfilterParams] = useState<filterItem>({
name:'',
name: '',
})
const [searchForm, setSearchForm] = useState({
searName: '',
buyer:'',//收货商
buyer: '',//收货商
dateSelect: '',
outSideStatus: '',
TimeRange: ''
})
const TimeList = [
{
label:'单据时间（全部）',value: ''
label: '单据时间（全部）', value: ''
},
{
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
}
]
const outSideStatusList = [
{
label:'外部状态(全部)',value: ''
label: '外部状态(全部)', value: ''
},
{
label:'待提交',value: 1
label: '待提交', value: 1
},
{
label:'待确认',value: 2
label: '待确认', value: 2
},
{
label:'接受物流单',value: 3
label: '接受物流单', value: 3
},
{
label:'不接受物流单',value: 4
label: '不接受物流单', value: 4
}
]
const handleCancel = () => {
}
const handletOk = (values:any) => {
const handletOk = (values: any) => {
console.log(values)
props.onCancel()
}
const data = [
{
id:'123',
key:'123',
name:'1231',
id: '123',
key: '123',
name: '1231',
}
]
const fetchData = (params:any) => {
if(props.type === 3){
return new Promise((resolve,reject) => {
PublicApi.getProductCommodityGetCommodityList({...params}).then(res => {
const fetchData = (params: any) => {
if (props.type === 3) {
return new Promise((resolve, reject) => {
PublicApi.getProductCommodityGetCommodityList({ ...params }).then(res => {
resolve(res.data)
})
})
......@@ -168,15 +168,16 @@ const listDialog: React.FC<Params> = (props) => {
props.type === 1 &&
<Select
style={{
marginRight:'16px'
marginRight: '16px'
}}
value={searchForm.buyer}
onChange={(val) => setSearchForm({ ...searchForm, buyer: val })}
>
<Option value=''>单据来源:订单</Option>
<Option value='1'>待审核</Option>
<Option value='2'>审核通过</Option>
<Option value='3'>审核不通过</Option>
<Option value='1'>订单</Option>
<Option value='2'>换货时申请单(退货发货)</Option>
<Option value='3'>换货申请单(换货发货)</Option>
<Option value='4'>退货申请单</Option>
</Select>
}
{
......@@ -184,19 +185,19 @@ const listDialog: React.FC<Params> = (props) => {
props.type === 3 &&
<Select
style={{
marginRight:'16px'
marginRight: '16px'
}}
value={searchForm.buyer}
onChange={(val) => setSearchForm({ ...searchForm, buyer: val })}
>
<Option value=''>来源:发货单</Option>
<Option value='1'>待审核</Option>
<Option value='2'>审核通过</Option>
<Option value='3'>审核不通过</Option>
<Option value='1'>发货单</Option>
<Option value='2'>订单/售后单</Option>
</Select>
}
<Tooltip trigger={['focus']} placement='top'
title={props.type === 1? '输入物流单号、订单号进行搜索':'输入物流单号、发货方进行搜索' }>
title={props.type === 2 ? '输入物流单号进行搜索' : '输入物流单号、发货方进行搜索'}>
<Input.Search
style={{ width: '232px' }}
value={searchForm.searName}
......@@ -205,18 +206,19 @@ const listDialog: React.FC<Params> = (props) => {
onSearch={() => handleSearch}
/>
</Tooltip>
<Button className={style['filter-btn']} onClick={() => setIsSearch(isSearch = !isSearch) }>
<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'}}>
<Row style={{ margin: '16px 0' }}>
{
isSearch &&
<Col>
<Space size={16}>
{
props.type === 1?
props.type === 1 ?
<Select
className={style.select}
value={searchForm.buyer}
......@@ -254,17 +256,7 @@ const listDialog: React.FC<Params> = (props) => {
})
}
</Select>
<Select
className={style.select}
value={searchForm.outSideStatus}
onChange={(val) => setSearchForm({ ...searchForm, outSideStatus: val })}
>
{
outSideStatusList.map((item) => {
return <Option value={item.value}>{item.label}</Option>
})
}
</Select>
</Space>
</Col>
}
</Row>
......
src/pages/logistics/list/addCompany.css
View file @ ed7914cf
.btn-wrap .ant-input-group .ant-input-group-addon {
.selectBtn {
padding: 0 !important;
}
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-wrapper .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-wrapper .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-group .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-group .ant-input-group-addon {
padding: 0 !important;
}
src/pages/logistics/list/addCompany.less
View file @ ed7914cf
.btn-wrap{
.ant-input-group{
.selectBtn{
padding: 0 !important;
}
.ant-form-item-control{
.ant-form-item-control-input{
.ant-form-item-control-input-content{
.ant-input-group-wrapper, .selectBtn{
.ant-input-wrapper ,.ant-input-group{
.ant-input-group-addon{
padding: 0 !important;
}
}
}
}
}
}
\ No newline at end of file
src/pages/logistics/list/addCompany.tsx
View file @ ed7914cf
......@@ -69,7 +69,7 @@ const { Option } = Select;
const defaultValue = 'lucy'
const company: React.FC<{}> = () => {
//hook只能写在函数组件的顶级作用域
const ref = useRef({})
const ref = useRef<any>({})
const [menuForm] = Form.useForm();
const [headerTitle, setHeaderTitle] = useState('新建物流公司')
const [Code, setCode] = useState('')
......@@ -224,7 +224,7 @@ const company: React.FC<{}> = () => {
}
]}
>
<Input className={style['btn-wrap']} disabled maxLength={20} addonAfter={selectBtn}/>
<Input className={style['selectBtn']} disabled maxLength={20} addonAfter={selectBtn}/>
</Form.Item>
:
<Form.Item
......
src/pages/logistics/list/company.tsx
View file @ ed7914cf
/*
* @Date: 2020-07-13 15:01:40
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 10:06:44
* @LastEditTime: 2020-08-03 16:52:53
*/
import React, { ReactNode, useRef } from 'react'
......@@ -50,7 +50,7 @@ const fetchData = (params?: any) => {
}
const Company: React.FC<{}> = () => {
const ref = useRef({})
const ref = useRef<any>({})
const columns: ColumnType<any>[] = [
{
......
src/pages/logistics/list/components/addressForm.tsx
View file @ ed7914cf
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-15 10:31:55
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-28 10:56:07
* @LastEditTime: 2020-08-03 17:59:56
*/
import React, { Component, useState, useEffect } from 'react';
import ReactDOM from 'react-dom'
......@@ -175,7 +175,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
setOptions(TelCodeList)
})
const getAllCode = setTimeout(()=> {
PublicApi.getWarehouseAreaByPcodeAll({ pcode: '100000' }).then(res => {
PublicApi.getManageAreaByPcodeAll({ pcode: '100000' }).then(res => {
let list = []
res.data.forEach((item: any, index: number) => {
list.push({ label: item.name, value: `${item.code}-${item.name}` })
......@@ -259,7 +259,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
state.value = ''
let list = []
let pcode = value && value.split('-').length > 1 ? value.split('-')[0] : value
PublicApi.getWarehouseAreaByPcodeAll({ pcode: pcode }).then(res => {
PublicApi.getManageAreaByPcodeAll({ pcode: pcode }).then(res => {
res.data.forEach((item: any, index: number) => {
// list.push({ label: item.name, value: item.code })
list.push({ label: item.name, value: `${item.code}-${item.name}` })
......@@ -277,7 +277,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
state.value = ''
let list = []
let pcode = value && value.split('-').length > 1 ? value.split('-')[0] : value
PublicApi.getWarehouseAreaByPcodeAll({ pcode: pcode }).then(res => {
PublicApi.getManageAreaByPcodeAll({ pcode: pcode }).then(res => {
res.data.forEach((item: any, index: number) => {
// list.push({ label: item.name, value: item.code })
list.push({ label: item.name, value: `${item.code}-${item.name}` })
......
src/pages/logistics/list/components/templateForm.tsx
View file @ ed7914cf
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-15 10:31:55
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 19:37:57
* @LastEditTime: 2020-08-03 18:02:39
*/
import React, { Component, useState, useEffect } from 'react';
import ReactDOM from 'react-dom'
......@@ -105,7 +105,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
}
// console.log(id,typeof id,history.location.query.isSee,typeof history.location.query.isSee)
setHeaderTitle(`${_title}运费模板`)
PublicApi.getWarehouseAreaByPcodeAll({ pcode: '100000' }).then(res => {
PublicApi.getManageAreaByPcodeAll({ pcode: '100000' }).then(res => {
let list = []
res.data.forEach((item: any, index: number) => {
list.push({ label: item.name, value: Number(item.code) })
......@@ -152,10 +152,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
history.goBack()
},1000)
}
const addStyle = {
padding: '2px 0',
textAlign: 'center'
}
const onSearch = () => {
}
......@@ -335,7 +332,8 @@ const diaLogForm: React.FC<ListProps> = (props) => {
operations: {
title: '操作'
},
renderAddition: () => <div style={addStyle}>+添加指定地区</div>,
renderAddition: () =>
<div style={{padding: '2px 0',textAlign: 'center'}}>+添加指定地区</div>,
renderMoveDown: () => null,
renderMoveUp: () => null,
renderRemove: (idx: any) => {
......
src/pages/logistics/list/template.tsx
View file @ ed7914cf
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-14 15:07:34
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-24 20:08:29
* @LastEditTime: 2020-08-03 11:19:53
*/
import React, { Component, ReactNode, useRef, useState } from 'react'
import { history } from 'umi'
......@@ -111,7 +111,7 @@ const EditableCell: React.FC<EditableCellProps> = ({
*/
const Template: React.FC<ListProps> = (props) => {
console.log(props)
const ref = useRef({})
const ref = useRef<any>({})
const [form] = Form.useForm();
const [table, setTable] = useState([])
const [editingKey, setEditingKey] = useState('');
......
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
View file @ ed7914cf
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-14 15:07:34
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-01 11:10:57
* @LastEditTime: 2020-08-03 15:48:15
*/
import React, { Component, ReactNode, useRef, useState, useEffect } from 'react'
import { history } from 'umi'
......@@ -199,7 +199,7 @@ const OrderList: React.FC<ListProps> = (props) => {
},
{
title: '外部状态',
align: 'center',
align: 'left',
dataIndex: 'status',
key: 'status',
filters: statusList,
......@@ -360,17 +360,6 @@ const OrderList: React.FC<ListProps> = (props) => {
})
}
</Select>
<Select
className={style.select}
value={searchForm.status}
onChange={(val) => setSearchForm({ ...searchForm, status: val })}
>
{
outSideStatusList.map((item,index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
</Space>
</Col>
}
......
src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx
View file @ ed7914cf
......@@ -2,9 +2,9 @@
* @Author: LeeJiancong
* @Date: 2020-07-28 11:25:30
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 17:37:44
* @LastEditTime: 2020-08-03 16:48:12
*/
import React, { Component, useEffect, useRef, useState } from 'react'
import React, { Component, useEffect, useRef, useState,ReactNode } from 'react'
import { Card, Row, Col, Tabs, Button, Input as SelectInput, Badge } from 'antd'
import { LinkOutlined } from '@ant-design/icons'
import { StandardTable } from 'god'
......@@ -82,17 +82,17 @@ const Deatail: React.FC<{}> = () => {
},
{
title: '状态',
align: 'center',
align: 'left',
dataIndex: 'name',
key: 'name',
render: (_: any, record) => {
return (
<>
<Badge color="#6C9CEB" text='待确认' />
<Badge status='error' text='不接受物流单' />
</>
)
}
render: (text: number, record: any) => {
let component: ReactNode = null;
text === 1 ? component = <Badge status='default' text="待提交" />:
text === 2 ? component = <Badge status='processing' text="待确认" />:
text === 3 ? component = <Badge status='success' text="接受物流单" />:
component = <Badge status='error' text="不接受物流单" />
return component;
},
},
{
title: '操作',
......
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
View file @ ed7914cf
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-14 15:07:34
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-01 11:12:49
* @LastEditTime: 2020-08-03 15:49:51
*/
import React, { Component, ReactNode, useRef, useState, useEffect } from 'react'
import { history } from 'umi'
......@@ -159,7 +159,7 @@ const OrderList: React.FC<ListProps> = (props) => {
},
{
title: '外部状态',
align: 'center',
align: 'left',
dataIndex: 'status',
key: 'status',
filters: statusList,
......
src/services/index.ts
View file @ ed7914cf
This source diff could not be displayed because it is too large. You can view the blob instead.
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