Browse Source

人员人工费用汇总表合计问题处理

ljb 5 months ago
parent
commit
30e1d875b5

+ 1 - 1
src/option/yfCostManage/yfCostStatistics/projectAllocationList.js

@@ -126,7 +126,7 @@ export default {
     },
     {
       label: '研发费用合计(元)',
-      prop: 'amount',
+      prop: 'total',
       span: 24,
       minWidth: 90,
       align: 'center',

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/person-cost-statistics/project-allocation-list.vue

@@ -144,7 +144,7 @@ export default window.$crudCommon({
 
       // 合计
       let amount = new Decimal(item.averageMonthlySalary || 0)
-      .add(new Decimal(item.socSecTotal || 0))
+      .add(new Decimal(item.totalInsurance || 0))
       .add(new Decimal(item.providentFund || 0))
       .add(new Decimal(item.bonus || 0))
       .add(new Decimal(item.benefit || 0))