Commit c5ce49df by yuzhenWang

Merge branch 'wyz' into 'test'

优化样式

See merge request !179
parents f0a0c0a2 45876a4b
...@@ -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: '120', width: '150',
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: '120', width: '150',
formatter: row => formatCurrency(row.paidAmount || 0) formatter: row => formatCurrency(row.paidAmount || 0)
}, },
{ {
prop: 'grossAmount', prop: 'grossAmount',
label: '应发合计', label: '应发合计',
sortable: true, sortable: true,
width: '120', width: '150',
formatter: row => formatCurrency(row.grossAmount || 0) formatter: row => formatCurrency(row.grossAmount || 0)
}, },
{ {
prop: 'totalDeductions', prop: 'totalDeductions',
label: '扣款合计', label: '扣款合计',
sortable: true, sortable: true,
width: '120', width: '150',
formatter: row => formatCurrency(row.totalDeductions || 0) formatter: row => formatCurrency(row.totalDeductions || 0)
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment