Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/statisticalReport/autoSettlementList.vue

@@ -1213,7 +1213,7 @@ export default {
             response.records[i].deductionAmountchange = false
             response.records[i].amountIngPayable = response.records[i].amountIngPayable.toFixed(2)
             response.records[i].amountEdPayable = response.records[i].amountEdPayable.toFixed(2)
-            response.records[i].amountNotPayable = (response.records[i].amountIngPayable - response.records[i]
+            response.records[i].amountNotPayable = (response.records[i].totalPayable - response.records[i]
               .amountEdPayable).toFixed(2)
             if (response.records[i].tranPriceApproveList) {
               for (var j = 0; j < response.records[i].tranPriceApproveList.length; j++) {