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
shenshaokai
jinfa-platform
Commits
ba029d4d
Commit
ba029d4d
authored
Aug 10, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 跳转订单的问题
parent
6e5fec95
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
index.tsx
...pplication/returnPrSubmit/components/ReturnForm/index.tsx
+10
-5
No files found.
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @
ba029d4d
...
...
@@ -7,11 +7,10 @@ import moment from 'moment';
import
{
findLastIndex
}
from
'lodash'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
SaveOutlined
,
PlusOutlined
}
from
'@ant-design/icons'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
createFormActions
,
FormEffectHooks
,
FormPath
}
from
'@formily/antd'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
GetAsReturnGoodsGetDetailByConsumerResponse
}
from
'@/services/AfterServiceV2Api'
;
import
{
normalizeFiledata
,
FileData
}
from
'@/utils'
;
import
{
PurchaseOrderOutWorkStateTexts
,
ORDER_TYPE2
}
from
'@/constants/order'
;
import
{
ORDER_TYPE_INQUIRY_CONTRACT
,
ORDER_TYPE_BIDDING_CONTRACT
,
...
...
@@ -70,13 +69,17 @@ interface DetailInfo {
interface
OrderNoProps
{
value
:
any
,
name
:
string
,
}
const
OrderNo
=
(
props
:
OrderNoProps
)
=>
{
const
{
value
}
=
props
;
const
{
value
,
name
}
=
props
;
const
extraData
=
addSchemaAction
.
getFieldValue
(
FormPath
.
transform
(
name
,
/
\d
/
,
$1
=>
{
return
`returnGoodsList.
${
$1
}
.extraData`
;
}));
return
(
<
a
href=
{
`/memberCenter/afterService/returnApplication/returnPrSubmit/orderDetail?
orderNo=${value
}`
}
href=
{
`/memberCenter/afterService/returnApplication/returnPrSubmit/orderDetail?
id=${extraData?.orderId
}`
}
target=
"_blank"
>
{
value
}
...
...
@@ -339,7 +342,8 @@ const ReturnForm: React.FC<BillsFormProps> = ({
returnReason
:
item
.
returnReason
,
payList
:
(
item
.
payList
||
[]).
map
(({
payId
,
...
rest
})
=>
({
...
rest
,
id
:
payId
})),
id
:
item
.
orderRecordId
,
taskTypeKey
,
taskTypeKey
,
orderId
:
item
.
orderId
,
},
associated
:
!
item
.
associatedProductId
?
''
:
`
${
item
.
productId
}
/
${
item
.
productName
}
/
${
item
.
associatedCategory
}
/
${
item
.
associatedBrand
}
`
,
materielNameAndType
:
`
${
item
.
associatedProductName
||
''
}${
item
.
associatedType
?
'/'
+
item
.
associatedType
:
''
}
`
,
...
...
@@ -619,6 +623,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
payList
:
item
.
payList
,
taskTypeKey
:
item
.
processKey
,
remaining
:
item
.
quantity
-
(
item
.
returnCount
||
0
),
// 可退货数量
orderId
:
item
.
orderId
,
},
isHasTax
:
item
.
tax
,
taxRate
:
item
.
taxRate
,
...
...
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