Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-csf-front
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yuzhenWang
yd-csf-front
Commits
c5ce49df
Commit
c5ce49df
authored
Jun 29, 2026
by
yuzhenWang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wyz' into 'test'
优化样式 See merge request
!179
parents
f0a0c0a2
45876a4b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/views/payslip/electronicSalary.vue
+4
-4
No files found.
src/views/payslip/electronicSalary.vue
View file @
c5ce49df
...
@@ -824,7 +824,7 @@ const electronicSalaryTableColumns = ref([
...
@@ -824,7 +824,7 @@ const electronicSalaryTableColumns = ref([
prop
:
'salaryNo'
,
prop
:
'salaryNo'
,
label
:
'发放编号'
,
label
:
'发放编号'
,
sortable
:
true
,
sortable
:
true
,
width
:
'1
2
0'
,
width
:
'1
5
0'
,
formatter
:
row
=>
row
.
salaryNo
||
'-'
formatter
:
row
=>
row
.
salaryNo
||
'-'
},
},
{
{
...
@@ -852,21 +852,21 @@ const electronicSalaryTableColumns = ref([
...
@@ -852,21 +852,21 @@ const electronicSalaryTableColumns = ref([
prop
:
'paidAmount'
,
prop
:
'paidAmount'
,
label
:
'实发金额'
,
label
:
'实发金额'
,
sortable
:
true
,
sortable
:
true
,
width
:
'1
2
0'
,
width
:
'1
5
0'
,
formatter
:
row
=>
formatCurrency
(
row
.
paidAmount
||
0
)
formatter
:
row
=>
formatCurrency
(
row
.
paidAmount
||
0
)
},
},
{
{
prop
:
'grossAmount'
,
prop
:
'grossAmount'
,
label
:
'应发合计'
,
label
:
'应发合计'
,
sortable
:
true
,
sortable
:
true
,
width
:
'1
2
0'
,
width
:
'1
5
0'
,
formatter
:
row
=>
formatCurrency
(
row
.
grossAmount
||
0
)
formatter
:
row
=>
formatCurrency
(
row
.
grossAmount
||
0
)
},
},
{
{
prop
:
'totalDeductions'
,
prop
:
'totalDeductions'
,
label
:
'扣款合计'
,
label
:
'扣款合计'
,
sortable
:
true
,
sortable
:
true
,
width
:
'1
2
0'
,
width
:
'1
5
0'
,
formatter
:
row
=>
formatCurrency
(
row
.
totalDeductions
||
0
)
formatter
:
row
=>
formatCurrency
(
row
.
totalDeductions
||
0
)
},
},
{
{
...
...
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