Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
bd864e77
Commit
bd864e77
authored
Apr 24, 2022
by
lxd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 样式修复
parent
f5bdc007
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
2 deletions
+31
-2
data.js
src/pages/PaymentMange/data.js
+12
-1
style.less
src/pages/PaymentMange/style.less
+1
-0
data.js
src/pages/ReconciliationQuery/data.js
+7
-0
data.js
src/pages/SettlementSheet/data.js
+10
-0
index.jsx
src/pages/SettlementSheet/index.jsx
+1
-1
No files found.
src/pages/PaymentMange/data.js
View file @
bd864e77
...
...
@@ -30,6 +30,7 @@ export function columns(res, pages) {
dataIndex
:
'
index
'
,
hideInSearch
:
true
,
width
:
'
50px
'
,
align
:
'
center
'
,
render
:
(
text
,
record
,
index
)
=>
(
current
-
1
)
*
pageSize
+
index
+
1
,
},
{
...
...
@@ -42,6 +43,7 @@ export function columns(res, pages) {
title
:
'
付款单批次号
'
,
dataIndex
:
'
payBatchNo
'
,
width
:
'
160px
'
,
align
:
'
center
'
,
},
{
title
:
'
付款单生成日期
'
,
...
...
@@ -85,47 +87,56 @@ export function columns(res, pages) {
dataIndex
:
'
saleAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
退款总额
'
,
dataIndex
:
'
refundAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
红字金额
'
,
dataIndex
:
'
pastRefundAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
蓝字金额
'
,
dataIndex
:
'
currentRefundAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
应付金额
'
,
dataIndex
:
'
payableAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
是否缺少红字发票
'
,
dataIndex
:
'
redInvoiceState
'
,
valueEnum
:
redInvoiceState
,
align
:
'
center
'
,
width
:
100
,
},
{
title
:
'
付款状态
'
,
dataIndex
:
'
payState
'
,
valueEnum
:
payStateEnum
,
width
:
'
110px
'
,
align
:
'
center
'
,
},
{
title
:
'
发票状态
'
,
dataIndex
:
'
blueInvoiceState
'
,
valueEnum
:
orderStateNum
,
width
:
'
110px
'
,
align
:
'
center
'
,
},
{
title
:
'
操作
'
,
...
...
@@ -134,7 +145,7 @@ export function columns(res, pages) {
key
:
'
option
'
,
align
:
'
center
'
,
fixed
:
'
right
'
,
width
:
20
0
,
width
:
8
0
,
render
:
(
_
,
row
)
=>
(
<
div
>
<
Button
...
...
src/pages/PaymentMange/style.less
View file @
bd864e77
.button {
display: block;
margin-bottom: 10px;
}
...
...
src/pages/ReconciliationQuery/data.js
View file @
bd864e77
...
...
@@ -20,18 +20,21 @@ export function columns(pages) {
dataIndex
:
'
index
'
,
hideInSearch
:
true
,
width
:
'
50px
'
,
align
:
'
center
'
,
render
:
(
text
,
record
,
index
)
=>
(
current
-
1
)
*
pageSize
+
index
+
1
,
},
{
title
:
'
供应商名称
'
,
dataIndex
:
'
supplierName
'
,
width
:
'
150px
'
,
align
:
'
center
'
,
hideInSearch
:
true
,
},
{
title
:
'
结算单批次号
'
,
dataIndex
:
'
settleBatchNo
'
,
width
:
'
160px
'
,
align
:
'
center
'
,
},
{
title
:
'
账单日期
'
,
...
...
@@ -57,18 +60,21 @@ export function columns(pages) {
valueEnum
:
activeStateEnum
,
width
:
'
120px
'
,
filters
:
false
,
align
:
'
center
'
,
},
{
title
:
'
金额
'
,
dataIndex
:
'
amount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
笔数
'
,
dataIndex
:
'
quantity
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
状态
'
,
...
...
@@ -76,6 +82,7 @@ export function columns(pages) {
valueEnum
:
orderStateNum
,
width
:
'
100px
'
,
filters
:
false
,
align
:
'
center
'
,
},
];
}
...
...
src/pages/SettlementSheet/data.js
View file @
bd864e77
...
...
@@ -26,6 +26,7 @@ export function columns(pages) {
dataIndex
:
'
index
'
,
hideInSearch
:
true
,
width
:
'
50px
'
,
align
:
'
center
'
,
render
:
(
text
,
record
,
index
)
=>
(
current
-
1
)
*
pageSize
+
index
+
1
,
},
{
...
...
@@ -33,16 +34,19 @@ export function columns(pages) {
dataIndex
:
'
supplierName
'
,
width
:
'
150px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
付款单批次号
'
,
dataIndex
:
'
payBatchNo
'
,
width
:
'
160px
'
,
align
:
'
center
'
,
},
{
title
:
'
结算单批次号
'
,
dataIndex
:
'
settleBatchNo
'
,
width
:
'
150px
'
,
align
:
'
center
'
,
},
{
title
:
'
结算单生成日期
'
,
...
...
@@ -70,6 +74,7 @@ export function columns(pages) {
width
:
'
120px
'
,
hideInSearch
:
true
,
filters
:
false
,
align
:
'
center
'
,
},
{
title
:
'
结算单生成日期
'
,
...
...
@@ -84,18 +89,21 @@ export function columns(pages) {
dataIndex
:
'
saleAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
退款金额
'
,
dataIndex
:
'
refundAmount
'
,
width
:
'
100px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
结算金额
'
,
dataIndex
:
'
payableAmount
'
,
width
:
'
130px
'
,
hideInSearch
:
true
,
align
:
'
center
'
,
},
{
title
:
'
结算状态
'
,
...
...
@@ -104,12 +112,14 @@ export function columns(pages) {
width
:
'
100px
'
,
initialValue
:
0
,
filters
:
false
,
align
:
'
center
'
,
},
{
title
:
'
是否生成付款单
'
,
dataIndex
:
'
isCreatePaymentBill
'
,
valueEnum
:
paymentStateEnum
,
hideInTable
:
true
,
align
:
'
center
'
,
},
];
}
...
...
src/pages/SettlementSheet/index.jsx
View file @
bd864e77
...
...
@@ -42,7 +42,7 @@ const SettlementSheet = () => {
return
true
;
}
notification
.
error
({
message
:
`
${
billPeriodData
.
text
}
帐期最多
生成
${
billPeriodData
.
maxlength
}
付款单
`
,
message
:
`
${
billPeriodData
.
text
}
帐期最多
可选
${
billPeriodData
.
maxlength
}
条
`
,
});
return
false
;
};
...
...
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