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
73114f7c
Commit
73114f7c
authored
Apr 21, 2022
by
leimo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20418order' into 'v2-220418'
数量 See merge request linkseeks-design/pro-platform!469
parents
ae0c378f
3f8292df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
6 deletions
+22
-6
details.tsx
...pages/order/deliveryNotice/receivingNoteQuery/details.tsx
+22
-6
No files found.
src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx
View file @
73114f7c
...
...
@@ -10,7 +10,7 @@ import {
DeliveryDateLabel
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryNoLabel
,
DeliveryPhoneLabel
,
DeliverySlefAddrLabel
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
ExternalRoamRecord
,
Harvest
,
LogisticsCarNoLabel
,
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
OutStatusLabel
,
ReceiptAbstractLabel
,
ReceivingAddress
,
ReceivingTime
,
ReNoLabel
LogisticsInfo
,
LogisticsNoLabel
,
Material
,
NoteLabel
,
OutStatusLabel
,
ReceiptAbstractLabel
,
ReceivingAddress
,
ReceivingTime
,
ReNoLabel
}
from
'../../constants'
import
{
BaseInfo
as
ContentBox
}
from
'@/components/BaseInfo'
import
{
Table
}
from
'antd'
;
...
...
@@ -32,8 +32,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
Harvest
,
DeliveryInfo
,
LogisticsInfo
,
DeliveryGood
,
ExternalRoamRecord
//
ExternalRoamRecord
])
const
[
info
,
setInfo
]
=
useState
<
any
>
({});
...
...
@@ -52,6 +52,21 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
service
.
getDetailInfoProductById
(
query
.
id
as
string
).
then
(
res
=>
{
setTableDataSource
(
res
?.
data
)
setAnchors
([
...
anchors
,
info
?.
type
===
1
?
{
...
DeliveryGood
,
...{
name
:
`
${
DeliveryGood
.
name
}
(
${
res
?.
data
?.
length
})
`
}
} : {
...Material,
...{
name: `
$
{
Material
.
name
}(
$
{
res
?.
data
?.
length
})
`
}
},
]);
setTotalCount(res?.totalCount)
})
...
...
@@ -178,7 +193,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</ContentBox>
<
ContentBox
title=
{
DeliveryGood
.
name
}
id=
{
DeliveryGood
.
key
}
cols=
{
1
}
>
<ContentBox title={info?.type ? DeliveryGood.name : Material.name}
id={info?.type ? DeliveryGood.key : Material.key} cols={1}>
<Table
columns={
...
...
@@ -193,13 +209,13 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</ContentBox>
<
ContentBox
title=
{
ExternalRoamRecord
.
name
}
id=
{
ExternalRoamRecord
.
key
}
cols=
{
1
}
>
{/*
<ContentBox title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
columns={ExternalRoamRecordTableColumn}
rowKey="id"
dataSource={outerHistoryList}
/>
</
ContentBox
>
</ContentBox>
*/}
</AnchorPage>
)
...
...
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