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
linweijiong
jinfa-platform
Commits
80614671
Commit
80614671
authored
Oct 23, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:积分商城列表库存显示字段
parent
235e566d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
237 additions
and
2 deletions
+237
-2
index.less
...rService/exchangeGoods/orderPreview/components/index.less
+49
-0
index.tsx
...hangeGoods/orderPreview/components/orderProcess/index.tsx
+67
-0
index.tsx
src/pages/afterService/exchangeGoods/orderPreview/index.tsx
+120
-1
list.tsx
src/pages/lxMall/pointsMall/list.tsx
+1
-1
No files found.
src/pages/afterService/exchangeGoods/orderPreview/components/index.less
0 → 100644
View file @
80614671
.card_wrap {
position: relative;
.card_title {
font-size: 16px;
font-weight: bold;
margin-bottom: 16px;
padding-top: 16px;
line-height: 16px;
}
.steps_wrap {
position: relative;
padding-top: 16px;
:global {
.ant-steps-item-content {
text-align: left;
width: auto;
}
.ant-steps-item-tail {
margin: 0 !important;
&::after {
width: 100%;
margin-left: 6px;
}
}
.ant-steps-item-icon {
margin-left: 0 !important;
}
}
}
:global {
.ant-card-body {
padding-top: 8px;
}
.ant-tabs-top>.ant-tabs-nav::before,
.ant-tabs-top>div>.ant-tabs-nav::before {
border-bottom: none;
}
}
}
\ No newline at end of file
src/pages/afterService/exchangeGoods/orderPreview/components/orderProcess/index.tsx
0 → 100644
View file @
80614671
import
React
from
'react'
import
{
Card
,
Steps
,
Tabs
}
from
'antd'
import
styles
from
'../index.less'
interface
taskItemType
{
step
:
number
,
taskName
:
string
,
roleName
:
string
,
isExecute
:
number
}
interface
OrderProcessPropsType
{
outerTaskList
?:
taskItemType
[],
innerTaskList
?:
taskItemType
[],
showTabs
?:
boolean
}
const
{
Step
}
=
Steps
const
{
TabPane
}
=
Tabs
const
OrderProcess
:
React
.
FC
<
OrderProcessPropsType
>
=
(
props
)
=>
{
const
{
outerTaskList
,
innerTaskList
,
showTabs
=
false
}
=
props
return
(
<
Card
className=
{
styles
.
card_wrap
}
>
{
showTabs
?
(
<
Tabs
defaultActiveKey=
"1"
>
<
TabPane
tab=
"外部流转"
key=
"1"
>
<
Steps
className=
{
styles
.
steps_wrap
}
progressDot
current=
{
outerTaskList
.
length
-
1
}
size=
"small"
>
{
outerTaskList
&&
outerTaskList
.
map
(
item
=>
(
<
Step
title=
{
item
.
taskName
}
description=
{
item
.
roleName
}
/>
))
}
</
Steps
>
</
TabPane
>
<
TabPane
tab=
"内部流转"
key=
"2"
>
<
Steps
className=
{
styles
.
steps_wrap
}
progressDot
current=
{
outerTaskList
.
length
-
1
}
size=
"small"
>
{
innerTaskList
&&
outerTaskList
.
map
(
item
=>
(
<
Step
title=
{
item
.
taskName
}
description=
{
item
.
roleName
}
/>
))
}
</
Steps
>
</
TabPane
>
</
Tabs
>
)
:
(
<>
<
div
className=
{
styles
.
card_title
}
>
外部流转
</
div
>
<
Steps
className=
{
styles
.
steps_wrap
}
progressDot
current=
{
outerTaskList
.
length
-
1
}
size=
"small"
>
{
outerTaskList
&&
outerTaskList
.
map
(
item
=>
(
<
Step
title=
{
item
.
taskName
}
description=
{
item
.
roleName
}
/>
))
}
</
Steps
>
</>
)
}
</
Card
>
)
}
export
default
OrderProcess
src/pages/afterService/exchangeGoods/orderPreview/index.tsx
View file @
80614671
...
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
...
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
import
{
Spin
}
from
'antd'
import
{
Spin
}
from
'antd'
import
OrderDetailHeader
from
'../../components/OrderDetailHeader'
import
OrderDetailHeader
from
'../../components/OrderDetailHeader'
import
OrderDetailWrapper
from
'../../components/OrderDetailWrapper'
import
OrderDetailWrapper
from
'../../components/OrderDetailWrapper'
import
OrderProcess
from
'./components/orderProcess'
interface
OrderPreviewPropsType
{
}
interface
OrderPreviewPropsType
{
}
...
@@ -29,11 +30,129 @@ const OrderPreview: React.FC<OrderPreviewPropsType> = (props) => {
...
@@ -29,11 +30,129 @@ const OrderPreview: React.FC<OrderPreviewPropsType> = (props) => {
{
label
:
'内部状态'
,
name
:
'createTime'
,
span
:
8
,
render
:
text
=>
'已确认售后完成'
},
{
label
:
'内部状态'
,
name
:
'createTime'
,
span
:
8
,
render
:
text
=>
'已确认售后完成'
},
]
]
const
outerTaskList
=
[
{
step
:
1
,
taskName
:
'提交换货申请单'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
2
,
taskName
:
'确认换货申请单'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
3
,
taskName
:
'退货发货'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
4
,
taskName
:
'退货收货'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
5
,
taskName
:
'确认退货回单'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
6
,
taskName
:
'换货发货'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
7
,
taskName
:
'换货收货'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
8
,
taskName
:
'确认换货回单'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
9
,
taskName
:
'确认售后完成'
,
roleName
:
'采购商'
,
isExecute
:
1
},
]
const
innerTaskList
=
[
{
step
:
1
,
taskName
:
'提交换货申请单'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
2
,
taskName
:
'确认换货申请单'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
3
,
taskName
:
'退货发货'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
4
,
taskName
:
'退货收货'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
5
,
taskName
:
'确认退货回单'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
6
,
taskName
:
'换货发货'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
7
,
taskName
:
'换货收货'
,
roleName
:
'采购商'
,
isExecute
:
1
},
{
step
:
8
,
taskName
:
'确认换货回单'
,
roleName
:
'供应商'
,
isExecute
:
1
},
{
step
:
9
,
taskName
:
'确认售后完成'
,
roleName
:
'采购商'
,
isExecute
:
1
},
]
return
(
return
(
<
Spin
spinning=
{
loading
}
>
<
Spin
spinning=
{
loading
}
>
<
OrderDetailHeader
headerTitle=
{
headerTiTle
}
detailList=
{
detailList
}
detailData=
{
formData
}
/>
<
OrderDetailHeader
headerTitle=
{
headerTiTle
}
detailList=
{
detailList
}
detailData=
{
formData
}
/>
<
OrderDetailWrapper
>
<
OrderDetailWrapper
>
111
<
OrderProcess
outerTaskList=
{
outerTaskList
}
innerTaskList=
{
innerTaskList
}
showTabs=
{
false
}
/>
</
OrderDetailWrapper
>
</
OrderDetailWrapper
>
</
Spin
>
</
Spin
>
)
)
...
...
src/pages/lxMall/pointsMall/list.tsx
View file @
80614671
...
@@ -45,7 +45,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
...
@@ -45,7 +45,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
{
item
.
min
===
item
.
max
?
`${numFormat(item.min)}`
:
`${numFormat(item.min)}~${numFormat(item.max)}`
}
积分
{
item
.
min
===
item
.
max
?
`${numFormat(item.min)}`
:
`${numFormat(item.min)}~${numFormat(item.max)}`
}
积分
</
div
>
</
div
>
<
div
className=
{
styles
.
goods_name
}
>
{
item
.
name
}
</
div
>
<
div
className=
{
styles
.
goods_name
}
>
{
item
.
name
}
</
div
>
<
div
className=
{
styles
.
count
}
>
库存:
{
item
.
s
old
||
0
}
</
div
>
<
div
className=
{
styles
.
count
}
>
库存:
{
item
.
s
tockCount
||
0
}
</
div
>
</
div
>
</
div
>
</
a
>
</
a
>
</
div
>
</
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