diff --git a/src/api/costOut/index.js b/src/api/costOut/index.js index 1279ab3..81ed38a 100644 --- a/src/api/costOut/index.js +++ b/src/api/costOut/index.js @@ -116,6 +116,7 @@ const sumForBsEnginAuditing=data=>{ data4:getValue(4), data5:getValue(5), data6:getValue(6), + data7:getValue(7), }; obj.percent=obj.data2==0?0:obj.data3*100.0/obj.data2; if(obj.percent>100){ @@ -139,21 +140,28 @@ const selectForBigEnginList=data=>{ names.push(k); let sum1=0; let sum2=0; + let sumTotal=0; let sum3=0; v.forEach(it=>{ it.forEach(item=>{ + item.money=item.money||0; + item.money2=item.money2||0; + item.money3=item.money3||0; item.money/=10000.0; item.money2/=10000.0; - item.money3=item.money-item.money2; + item.money3/=10000.0; + item.moneyTotal=item.money-item.money2; sum1+=item.money; sum2+=item.money2; sum3+=item.money3; + sumTotal+=item.moneyTotal; }) }); v.push({ sum1:sum1, sum2:sum2, - sum3:sum3 + sum3:sum3, + sumTotal:sumTotal }); } reslove({ diff --git a/src/pages/engin/auditingPage.vue b/src/pages/engin/auditingPage.vue index 15ca623..3a86444 100644 --- a/src/pages/engin/auditingPage.vue +++ b/src/pages/engin/auditingPage.vue @@ -97,12 +97,18 @@ +
挂账总金额(万元)
- - +
+
+
+
农民工专户支付金额(万元)
+
+ +
@@ -116,18 +122,20 @@
{{ it }}
- - - + + + - + + - + +
付款项付款明细申请时间付款项付款明细申请时间 申请金额(万元) 已付款金额(万元)挂账金额(万元)含农民工专户支付金额(万元)挂账金额(万元)
合计 {{ (sumList.data[it][2].sum1 * 1.0).toFixed(2) }}{{ (sumList.data[it][2].sum2 * 1.0).toFixed(2) }}{{ (sumList.data[it][2].sum2 * 1.0).toFixed(2) }} {{ (sumList.data[it][2].sum3 * 1.0).toFixed(2) }}{{ (sumList.data[it][2].sumTotal * 1.0).toFixed(2) }}