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
dc2cf368
Commit
dc2cf368
authored
Dec 29, 2021
by
卢均锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 业务对账&业务对账协同详情字段修改
parent
e9161e62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
index.tsx
src/pages/balance/businessReconciliation/detail/index.tsx
+9
-4
index.tsx
...ance/businessReconciliationCollaboration/detail/index.tsx
+9
-4
No files found.
src/pages/balance/businessReconciliation/detail/index.tsx
View file @
dc2cf368
...
@@ -53,7 +53,11 @@ const SearchDetail = () => {
...
@@ -53,7 +53,11 @@ const SearchDetail = () => {
},
[
pathPci
])
},
[
pathPci
])
const
_getDetail
=
()
=>
{
const
_getDetail
=
()
=>
{
getSettleAccountsBusinessReconciliationDetailReconciliation
({
reconciliationId
:
id
,
reconciliationNo
:
no
}).
then
((
res
)
=>
{
const
_param
:
any
=
{
reconciliationId
:
id
,
reconciliationNo
:
no
}
getSettleAccountsBusinessReconciliationDetailReconciliation
(
_param
).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
const
data
=
res
.
data
;
const
data
=
res
.
data
;
setDataSource
(
data
);
setDataSource
(
data
);
...
@@ -65,7 +69,7 @@ const SearchDetail = () => {
...
@@ -65,7 +69,7 @@ const SearchDetail = () => {
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
extra
:
data
.
reconciliationAbstract
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
extra
:
data
.
reconciliationAbstract
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangdanleixing'
}),
extra
:
data
.
reconciliationType
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangdanleixing'
}),
extra
:
data
.
reconciliationType
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
extra
:
data
.
remark
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
extra
:
data
.
remark
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.zhuangtai'
}),
extra
:
<
StatusTag
type=
'primary'
title=
{
data
.
status
}
/>,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.zhuangtai'
}),
extra
:
<
StatusTag
type=
'primary'
title=
{
data
.
status
Name
}
/>,
type
:
'text'
},
]
]
},
},
{
{
...
@@ -121,7 +125,8 @@ const SearchDetail = () => {
...
@@ -121,7 +125,8 @@ const SearchDetail = () => {
title
:
'发货批次'
,
title
:
'发货批次'
,
key
:
'deliveryBatch'
,
key
:
'deliveryBatch'
,
dataIndex
:
'deliveryBatch'
,
dataIndex
:
'deliveryBatch'
,
width
:
150
width
:
150
,
render
:
(
text
:
any
,
record
:
any
)
=>
`第
${
text
}
批`
,
},
},
{
{
title
:
'发货单号'
,
title
:
'发货单号'
,
...
@@ -231,7 +236,7 @@ const SearchDetail = () => {
...
@@ -231,7 +236,7 @@ const SearchDetail = () => {
tabLink=
{
_tabs
}
tabLink=
{
_tabs
}
components=
{
components=
{
<
Fragment
>
<
Fragment
>
<
ProgressLayout
effect=
{
[{
title
:
'外部流转'
,
state
:
1
,
logs
:
[]
}]
}
/>
<
ProgressLayout
effect=
{
[{
title
:
'外部流转'
,
state
:
1
,
logs
:
dataSource
?.
externalLogStates
}]
}
/>
<
CommonLayout
layoutId=
"basicLayout"
title=
{
intl
.
formatMessage
({
id
:
'balance.jibenxinxi'
})
}
effect=
{
basicEffect
}
commonSpan=
{
12
}
/>
<
CommonLayout
layoutId=
"basicLayout"
title=
{
intl
.
formatMessage
({
id
:
'balance.jibenxinxi'
})
}
effect=
{
basicEffect
}
commonSpan=
{
12
}
/>
<
Card
id=
'billLayout'
title=
{
intl
.
formatMessage
({
id
:
'balance.duizhangdanmingxi'
})
}
>
<
Card
id=
'billLayout'
title=
{
intl
.
formatMessage
({
id
:
'balance.duizhangdanmingxi'
})
}
>
<
StandardTable
<
StandardTable
...
...
src/pages/balance/businessReconciliationCollaboration/detail/index.tsx
View file @
dc2cf368
...
@@ -60,7 +60,11 @@ const SearchDetail = () => {
...
@@ -60,7 +60,11 @@ const SearchDetail = () => {
},
[
pathPci
])
},
[
pathPci
])
const
_getDetail
=
()
=>
{
const
_getDetail
=
()
=>
{
getSettleAccountsBusinessReconciliationDetailReconciliation
({
reconciliationId
:
id
,
reconciliationNo
:
no
}).
then
((
res
)
=>
{
const
_params
:
any
=
{
reconciliationId
:
id
,
reconciliationNo
:
no
}
getSettleAccountsBusinessReconciliationDetailReconciliation
(
_params
).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
const
data
=
res
.
data
;
const
data
=
res
.
data
;
setDataSource
(
data
);
setDataSource
(
data
);
...
@@ -72,7 +76,7 @@ const SearchDetail = () => {
...
@@ -72,7 +76,7 @@ const SearchDetail = () => {
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
extra
:
data
.
reconciliationAbstract
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.danjuzhaiyao'
}),
extra
:
data
.
reconciliationAbstract
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangdanleixing'
}),
extra
:
data
.
reconciliationType
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.duizhangdanleixing'
}),
extra
:
data
.
reconciliationType
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
extra
:
data
.
remark
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.beizhu'
}),
extra
:
data
.
remark
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.zhuangtai'
}),
extra
:
<
StatusTag
type=
'primary'
title=
{
data
.
status
}
/>,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.zhuangtai'
}),
extra
:
<
StatusTag
type=
'primary'
title=
{
data
.
status
Name
}
/>,
type
:
'text'
},
]
]
},
},
{
{
...
@@ -128,7 +132,8 @@ const SearchDetail = () => {
...
@@ -128,7 +132,8 @@ const SearchDetail = () => {
title
:
'发货批次'
,
title
:
'发货批次'
,
key
:
'deliveryBatch'
,
key
:
'deliveryBatch'
,
dataIndex
:
'deliveryBatch'
,
dataIndex
:
'deliveryBatch'
,
width
:
150
width
:
150
,
render
:
(
text
:
any
,
record
:
any
)
=>
`第
${
text
}
批`
,
},
},
{
{
title
:
'发货单号'
,
title
:
'发货单号'
,
...
@@ -265,7 +270,7 @@ const SearchDetail = () => {
...
@@ -265,7 +270,7 @@ const SearchDetail = () => {
tabLink=
{
_tabs
}
tabLink=
{
_tabs
}
components=
{
components=
{
<
Fragment
>
<
Fragment
>
<
ProgressLayout
effect=
{
[{
title
:
'外部流转'
,
state
:
1
,
logs
:
[]
}]
}
/>
<
ProgressLayout
effect=
{
[{
title
:
'外部流转'
,
state
:
1
,
logs
:
dataSource
?.
externalLogStates
}]
}
/>
<
CommonLayout
layoutId=
"basicLayout"
title=
{
intl
.
formatMessage
({
id
:
'balance.jibenxinxi'
})
}
effect=
{
basicEffect
}
commonSpan=
{
12
}
/>
<
CommonLayout
layoutId=
"basicLayout"
title=
{
intl
.
formatMessage
({
id
:
'balance.jibenxinxi'
})
}
effect=
{
basicEffect
}
commonSpan=
{
12
}
/>
<
Card
id=
'billLayout'
title=
{
intl
.
formatMessage
({
id
:
'balance.duizhangdanmingxi'
})
}
>
<
Card
id=
'billLayout'
title=
{
intl
.
formatMessage
({
id
:
'balance.duizhangdanmingxi'
})
}
>
<
StandardTable
<
StandardTable
...
...
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