Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
93444a6e
Commit
93444a6e
authored
Oct 27, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:售后订单详情也
parent
3a11a641
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
341 additions
and
16 deletions
+341
-16
index.tsx
...angeGoods/orderPreview/components/replaceDetail/index.tsx
+74
-2
index.tsx
...hangeGoods/orderPreview/components/replaceGoods/index.tsx
+80
-2
detailed.tsx
...ngeGoods/orderPreview/components/returnGoods/detailed.tsx
+26
-0
index.less
...hangeGoods/orderPreview/components/returnGoods/index.less
+29
-0
index.tsx
...changeGoods/orderPreview/components/returnGoods/index.tsx
+77
-4
index.tsx
...ngeGoods/waitSubmitOrderList/components/taskLog/index.tsx
+55
-8
No files found.
src/pages/afterService/exchangeGoods/orderPreview/components/replaceDetail/index.tsx
View file @
93444a6e
import
React
from
'react'
import
{
Card
,
Tabs
}
from
'antd'
import
{
Card
,
Tabs
,
Table
}
from
'antd'
import
EyePreview
from
'@/components/EyePreview'
import
styles
from
'../index.less'
interface
taskItemType
{
...
...
@@ -18,11 +19,82 @@ const { TabPane } = Tabs
const
ReplaceDetail
:
React
.
FC
<
ReplaceDetailPropsType
>
=
(
props
)
=>
{
const
{
}
=
props
const
columns
=
[
{
title
:
'订单号'
,
dataIndex
:
'applyNo'
,
key
:
'applyNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/`
}
>
{
text
}
</
EyePreview
>
},
ellipsis
:
true
,
},
{
title
:
'ID'
,
dataIndex
:
'operator'
,
ellipsis
:
true
,
},
{
title
:
'商品名称'
,
dataIndex
:
'status'
,
ellipsis
:
true
,
},
{
title
:
'品类'
,
dataIndex
:
'operate'
,
ellipsis
:
true
,
},
{
title
:
'品牌'
,
dataIndex
:
'operateTime'
,
ellipsis
:
true
,
},
{
title
:
'单位'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'换货数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'已换货发货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'未换货发货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'已换货收货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'差异数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
]
return
(
<
Card
className=
{
styles
.
card_wrap
}
>
<
Tabs
defaultActiveKey=
"1"
>
<
TabPane
tab=
"换货收货统计"
key=
"1"
>
换货收货统计
<
Table
className=
"common_tb"
dataSource=
{
[{},
{}]
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
columns
}
/>
</
TabPane
>
<
TabPane
tab=
"换货收货明细"
key=
"2"
>
换货收货明细
...
...
src/pages/afterService/exchangeGoods/orderPreview/components/replaceGoods/index.tsx
View file @
93444a6e
import
React
from
'react'
import
{
Card
}
from
'antd'
import
{
Card
,
Table
}
from
'antd'
import
EyePreview
from
'@/components/EyePreview'
import
styles
from
'../index.less'
interface
taskItemType
{
...
...
@@ -16,10 +17,87 @@ interface ReplaceGoodsPropsType {
const
ReplaceGoods
:
React
.
FC
<
ReplaceGoodsPropsType
>
=
(
props
)
=>
{
const
{
}
=
props
const
columns
=
[
{
title
:
'订单号'
,
dataIndex
:
'applyNo'
,
key
:
'applyNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/`
}
>
{
text
}
</
EyePreview
>
},
ellipsis
:
true
,
},
{
title
:
'ID'
,
dataIndex
:
'operator'
,
ellipsis
:
true
,
},
{
title
:
'商品名称'
,
dataIndex
:
'status'
,
ellipsis
:
true
,
},
{
title
:
'品类'
,
dataIndex
:
'operate'
,
ellipsis
:
true
,
},
{
title
:
'品牌'
,
dataIndex
:
'operateTime'
,
ellipsis
:
true
,
},
{
title
:
'单位'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'采购数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'采购单价'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'采购金额'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'换货数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'换货原因'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'是否退货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
]
return
(
<
Card
className=
{
styles
.
card_wrap
}
>
<
div
className=
{
styles
.
card_title
}
>
换货商品
</
div
>
<
Table
className=
"common_tb"
dataSource=
{
[{},
{}]
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
columns
}
/>
</
Card
>
)
}
...
...
src/pages/afterService/exchangeGoods/orderPreview/components/returnGoods/detailed.tsx
0 → 100644
View file @
93444a6e
import
React
from
'react'
import
{
Descriptions
}
from
'antd'
import
cx
from
'classnames'
import
styles
from
'./index.less'
interface
ReturnDetailedPropsType
{
}
const
ReturnDetailed
:
React
.
FC
<
ReturnDetailedPropsType
>
=
(
props
)
=>
{
return
(
<
div
className=
{
styles
.
detailed_wrap
}
>
<
div
className=
{
styles
.
batch_list
}
>
<
div
className=
{
cx
(
styles
.
batch_list_item
,
styles
.
active
)
}
>
第一批次
</
div
>
<
div
className=
{
styles
.
batch_list_item
}
>
第二批次
</
div
>
<
div
className=
{
styles
.
batch_list_item
}
>
第三批次
</
div
>
</
div
>
<
div
className=
{
styles
.
detail_description_wrap
}
>
<
div
className=
{
styles
.
detail_description_item
}
></
div
>
<
div
className=
{
styles
.
detail_description_item
}
></
div
>
<
div
className=
{
styles
.
detail_description_item
}
></
div
>
</
div
>
</
div
>
)
}
export
default
ReturnDetailed
src/pages/afterService/exchangeGoods/orderPreview/components/returnGoods/index.less
0 → 100644
View file @
93444a6e
.detailed_wrap {
.batch_list {
display: flex;
&_item {
width: 88px;
height: 32px;
line-height: 32px;
text-align: center;
color: #606266;
border: 1px solid #DCDFE6;
cursor: pointer;
&.active {
background-color: #6B778C;
color: #FFF;
border: 1px solid #6B778C;
}
}
}
.detail_description {
margin-top: 24px;
background: #F7F8FA;
}
}
\ No newline at end of file
src/pages/afterService/exchangeGoods/orderPreview/components/returnGoods/index.tsx
View file @
93444a6e
import
React
from
'react'
import
{
Card
,
Tabs
}
from
'antd'
import
{
Card
,
Tabs
,
Table
}
from
'antd'
import
EyePreview
from
'@/components/EyePreview'
import
ReturnDetailed
from
'./detailed'
import
styles
from
'../index.less'
interface
taskItemType
{
...
...
@@ -18,14 +20,85 @@ const { TabPane } = Tabs
const
ReturnGoods
:
React
.
FC
<
ReturnGoodsPropsType
>
=
(
props
)
=>
{
const
{
}
=
props
const
columns
=
[
{
title
:
'订单号'
,
dataIndex
:
'applyNo'
,
key
:
'applyNo'
,
render
:
(
text
,
record
)
=>
{
// 查看订单, 需根据状态显示不同schema
return
<
EyePreview
url=
{
`/`
}
>
{
text
}
</
EyePreview
>
},
ellipsis
:
true
,
},
{
title
:
'ID'
,
dataIndex
:
'operator'
,
ellipsis
:
true
,
},
{
title
:
'商品名称'
,
dataIndex
:
'status'
,
ellipsis
:
true
,
},
{
title
:
'品类'
,
dataIndex
:
'operate'
,
ellipsis
:
true
,
},
{
title
:
'品牌'
,
dataIndex
:
'operateTime'
,
ellipsis
:
true
,
},
{
title
:
'单位'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'换货数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'已退货发货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'未退货发货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'已退货收货'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
{
title
:
'差异数量'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
]
return
(
<
Card
className=
{
styles
.
card_wrap
}
>
<
Tabs
defaultActiveKey=
"
1
"
>
<
Tabs
defaultActiveKey=
"
2
"
>
<
TabPane
tab=
"退货发货统计"
key=
"1"
>
退货发货统计
<
Table
className=
"common_tb"
dataSource=
{
[{},
{}]
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
columns
}
/>
</
TabPane
>
<
TabPane
tab=
"退货发货明细"
key=
"2"
>
退货发货明细
<
ReturnDetailed
/>
</
TabPane
>
</
Tabs
>
...
...
src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/taskLog/index.tsx
View file @
93444a6e
import
React
from
'react'
import
{
Table
}
from
'antd'
import
{
Table
,
Tabs
,
}
from
'antd'
import
styles
from
'../../../../common/styles.less'
const
{
TabPane
}
=
Tabs
interface
TaskLogPropsType
{
dataSource
:
[]
...
...
@@ -10,7 +11,7 @@ interface TaskLogPropsType {
const
TaskLog
:
React
.
FC
<
TaskLogPropsType
>
=
(
props
)
=>
{
const
{
dataSource
}
=
props
const
c
olumns
=
[
const
innerC
olumns
=
[
{
title
:
'序号'
,
dataIndex
:
'step'
,
...
...
@@ -53,15 +54,61 @@ const TaskLog: React.FC<TaskLogPropsType> = (props) => {
},
]
const
outerColumns
=
[
{
title
:
'序号'
,
dataIndex
:
'step'
,
ellipsis
:
true
,
},
{
title
:
'操作角色'
,
dataIndex
:
'operator'
,
ellipsis
:
true
,
},
{
title
:
'状态'
,
dataIndex
:
'status'
,
ellipsis
:
true
,
},
{
title
:
'操作'
,
dataIndex
:
'operate'
,
ellipsis
:
true
,
},
{
title
:
'操作时间'
,
dataIndex
:
'operateTime'
,
ellipsis
:
true
,
},
{
title
:
'审核意见'
,
dataIndex
:
'opinion'
,
ellipsis
:
true
,
},
]
return
(
<
div
>
<
Table
className=
"common_tb"
dataSource=
{
dataSource
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
columns
}
/>
<
Tabs
defaultActiveKey=
"1"
type=
"card"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
Table
className=
"common_tb"
dataSource=
{
dataSource
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
outerColumns
}
/>
</
TabPane
>
<
TabPane
tab=
"内部流转"
key=
"2"
>
<
Table
className=
"common_tb"
dataSource=
{
dataSource
}
rowClassName=
{
(
_
,
index
)
=>
(
index
===
0
||
(
index
%
2
)
===
0
)
&&
"tb_bg"
}
columns=
{
innerColumns
}
/>
</
TabPane
>
</
Tabs
>
</
div
>
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment