diff --git a/jinbooks-ui/src/views/hr/calc-salary.vue b/jinbooks-ui/src/views/hr/calc-salary.vue index 4b729e7..0fbfe7b 100644 --- a/jinbooks-ui/src/views/hr/calc-salary.vue +++ b/jinbooks-ui/src/views/hr/calc-salary.vue @@ -171,6 +171,12 @@ + + + diff --git a/jinbooks-ui/src/views/hr/calc-salary/edit.vue b/jinbooks-ui/src/views/hr/calc-salary/edit.vue index 05f574f..89b1e57 100644 --- a/jinbooks-ui/src/views/hr/calc-salary/edit.vue +++ b/jinbooks-ui/src/views/hr/calc-salary/edit.vue @@ -49,14 +49,14 @@ -

应发金额 {{(form.payBasic + +

工资金额 {{(form.payBasic + form.payPost + form.payMerit + form.laborFee + form.bonus + form.overtime + form.allowance + - form.backPay).toFixed(2)}}

+ form.backPay).toFixed(2)}} 应发金额 {{(form.payAmount||0.00).toFixed(2)}} diff --git a/jinbooks-ui/src/views/hr/salary-detail.vue b/jinbooks-ui/src/views/hr/salary-detail.vue index 2b1742a..e7d6c30 100644 --- a/jinbooks-ui/src/views/hr/salary-detail.vue +++ b/jinbooks-ui/src/views/hr/salary-detail.vue @@ -187,6 +187,12 @@ {{ formatAmount(scope.row.taxDeduction) }}
+ + + - - - --> + --> + + + + + +