Merge branch 'wyz' into 'test'

修复薪资单搜索bug

See merge request !172

src/views/payslip/electronicSalary.vue

@@ -539,6 +539,7 @@ const searchConfig = ref([
     type: 'month',
     type: 'month',
     prop: 'month',
     prop: 'month',
     label: '薪资年月',
     label: '薪资年月',
+    valueFormat: 'YYYYMM',
     startPlaceholder: '开始时间',
     startPlaceholder: '开始时间',
     endPlaceholder: '结束时间'
     endPlaceholder: '结束时间'
   },
   },
@@ -830,7 +831,7 @@ const electronicSalaryTableColumns = ref([
   },
   },
   {
   {
     prop: 'month',
     prop: 'month',
-    label: '薪资月份',
+    label: '薪资年月',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => row.month || '-'
     formatter: row => row.month || '-'

src/views/payslip/wordReferenceSalary.vue

@@ -880,6 +880,7 @@ const searchConfig = ref([
     type: 'month',
     type: 'month',
     prop: 'month',
     prop: 'month',
     label: '薪资年月',
     label: '薪资年月',
+    valueFormat: 'YYYYMM',
     startPlaceholder: '开始时间',
     startPlaceholder: '开始时间',
     endPlaceholder: '结束时间'
     endPlaceholder: '结束时间'
   },
   },