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
1
Merge Requests
1
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
79baf546
Commit
79baf546
authored
Jun 24, 2026
by
yuzhenWang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wyz' into 'test'
修复薪资单搜索bug See merge request
!172
parents
5a2f5eb0
b7f0b444
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
src/views/payslip/electronicSalary.vue
+2
-1
src/views/payslip/wordReferenceSalary.vue
+1
-0
No files found.
src/views/payslip/electronicSalary.vue
View file @
79baf546
...
...
@@ -539,6 +539,7 @@ const searchConfig = ref([
type
:
'month'
,
prop
:
'month'
,
label
:
'薪资年月'
,
valueFormat
:
'YYYYMM'
,
startPlaceholder
:
'开始时间'
,
endPlaceholder
:
'结束时间'
},
...
...
@@ -830,7 +831,7 @@ const electronicSalaryTableColumns = ref([
},
{
prop
:
'month'
,
label
:
'薪资
月份
'
,
label
:
'薪资
年月
'
,
sortable
:
true
,
width
:
'120'
,
formatter
:
row
=>
row
.
month
||
'-'
...
...
src/views/payslip/wordReferenceSalary.vue
View file @
79baf546
...
...
@@ -880,6 +880,7 @@ const searchConfig = ref([
type
:
'month'
,
prop
:
'month'
,
label
:
'薪资年月'
,
valueFormat
:
'YYYYMM'
,
startPlaceholder
:
'开始时间'
,
endPlaceholder
:
'结束时间'
},
...
...
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