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
6219e2d6
Commit
6219e2d6
authored
Apr 17, 2023
by
shenshaokai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:[47881] 对账单请款新增页面,去掉结算日期字段
parent
32ef2ad2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
add.tsx
src/pages/balance/businessRequestFunds/admin/add.tsx
+10
-10
index.tsx
src/pages/balance/businessRequestFunds/detail/index.tsx
+2
-2
No files found.
src/pages/balance/businessRequestFunds/admin/add.tsx
View file @
6219e2d6
...
...
@@ -157,7 +157,7 @@ const Add = () => {
form
.
setFieldsValue
({
applyAbstract
:
_state
?.
data
.
applyAbstract
,
payee
:
_state
?.
data
.
payee
,
settlementTime
:
_state
?.
data
?.
settlementTime
?
moment
(
_state
.
data
.
settlementTime
)
:
undefined
,
//
settlementTime: _state?.data?.settlementTime ? moment(_state.data.settlementTime) : undefined,
expectPayTime
:
_state
?.
data
?.
expectPayTime
?
moment
(
_state
.
data
.
expectPayTime
)
:
undefined
,
})
setTabelSource
(
_state
?.
data
.
rows
)
...
...
@@ -194,7 +194,7 @@ const Add = () => {
applyType
:
data
.
applyType
,
applyAbstract
:
data
.
applyAbstract
,
expectPayTime
:
moment
(
data
.
expectPayTime
),
settlementTime
:
data
.
settlementTime
?
moment
(
data
.
settlementTime
)
:
undefined
,
//
settlementTime: data.settlementTime ? moment(data.settlementTime) : undefined,
payWay
:
data
.
payWay
,
moneyPayWay
:
data
.
moneyPayWay
,
payMonth
:
data
.
payMonth
,
...
...
@@ -309,7 +309,7 @@ const Add = () => {
...
dataSource
,
...
formRes
,
rows
:
_tableSource
,
settlementTime
:
formatTimeString
(
formRes
.
settlementTime
,
'YYYY-MM-DD'
),
//
settlementTime: formatTimeString(formRes.settlementTime, 'YYYY-MM-DD'),
expectPayTime
:
formatTimeString
(
formRes
.
expectPayTime
,
'YYYY-MM-DD'
),
payer
:
name
,
buyerMemberId
:
memberId
,
...
...
@@ -515,7 +515,7 @@ const Add = () => {
_rows
=
_rows
.
map
((
item
)
=>
{
return
{
...
item
,
applyPayment
:
item
?.
applyPayment
??
Number
(
item
.
billAmount
-
item
.
paid
-
item
.
appliedUnpaid
)
}
})
const
_tabelSource
=
[...
tabelSource
].
concat
(
_rows
)
console
.
log
(
_tabelSource
,
'_tabelSource'
);
form
.
setFieldsValue
({
'rows'
:
_tabelSource
,
'paymentClauseTypeName'
:
_tabelSource
[
0
].
paymentTypeName
})
setTabelSource
(
_tabelSource
);
form
.
setFieldsValue
({
'rows'
:
_tabelSource
})
...
...
@@ -547,10 +547,10 @@ const Add = () => {
<
Text
type=
'secondary'
>
{
text
}
</
Text
>
</
Space
>
)
},
},
{
title
:
'预计结算日期'
,
dataIndex
:
'settlementTime'
,
dataIndex
:
'settlementTime'
,
width
:
120
,
},{
title
:
intl
.
formatMessage
({
id
:
'balance.businessRequestFunds.admin.add.columns.billTypeName'
}),
...
...
@@ -655,10 +655,10 @@ const Add = () => {
<
Text
type=
'secondary'
>
{
text
}
</
Text
>
</
Space
>
)
},
},
{
title
:
'预计结算日期'
,
dataIndex
:
'settlementTime'
,
dataIndex
:
'settlementTime'
,
width
:
120
,
},{
title
:
intl
.
formatMessage
({
id
:
'balance.businessRequestFunds.admin.add.fundsColumns.billTypeName'
}),
...
...
@@ -868,7 +868,7 @@ const Add = () => {
</
Col
>
</
Row
>
)
}
<
Row
gutter=
{
[
8
,
8
]
}
>
{
/*
<Row gutter={[8, 8]}>
<Col span={24}>
<Form.Item
label={intl.formatMessage({ id: 'balance.components.confirmAccount.text.1' })}
...
...
@@ -878,7 +878,7 @@ const Add = () => {
<DatePicker style={{ width: '100%' }} disabledDate={disabledDate} />
</Form.Item>
</Col>
</
Row
>
</Row>
*/
}
<
Row
gutter=
{
[
8
,
8
]
}
>
<
Col
span=
{
24
}
>
<
Form
.
Item
...
...
src/pages/balance/businessRequestFunds/detail/index.tsx
View file @
6219e2d6
...
...
@@ -112,7 +112,7 @@ const SearchDetail = () => {
{
label
:
intl
.
formatMessage
({
id
:
'balance.businessRequestFunds.detail.col.expectPayTime'
}),
extra
:
formatTimeString
(
data
.
expectPayTime
,
'YYYY-MM-DD'
),
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.businessRequestFunds.detail.col.payWay'
}),
extra
:
data
?.
paymentClauseTypeName
,
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.jiesuanfangshi'
}),
extra
:
_returnPayWay
(
data
),
type
:
'text'
},
{
label
:
intl
.
formatMessage
({
id
:
'balance.platformSettlement.integral.columns.settlementDate'
}),
extra
:
formatTimeString
(
data
.
settlementTime
,
'YYYY-MM-DD'
),
type
:
'text'
},
//
{ label: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementDate' }), extra: formatTimeString(data.settlementTime, 'YYYY-MM-DD'), type: 'text' },
{
label
:
'合同付款方式'
,
extra
:
data
.
payTypeName
||
''
,
type
:
'text'
}
]
},
...
...
@@ -174,7 +174,7 @@ const SearchDetail = () => {
},
{
title
:
'预计结算日期'
,
dataIndex
:
'settlementTime'
,
dataIndex
:
'settlementTime'
,
},
{
title
:
intl
.
formatMessage
({
id
:
'balance.businessRequestFunds.detail.columns.billTypeName'
}),
...
...
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