diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php index 941bdd6fd..099c5fbe3 100644 --- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php +++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php @@ -85,11 +85,11 @@ //开票金额 $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['id'])->sum('apply_amount'); //未开票金额 - $data['not_total_invoice_amount'] = bcsub($data['money'], $data['total_invoice_amount'], 2); + $data['not_total_invoice_amount'] = bcsub($data['signed_amount'], $data['total_invoice_amount'], 2); //到账金额 $data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['id'])->sum('amount'); //未到账金额 - $data['not_total_refund_amount'] = bcsub($data['money'], $data['total_refund_amount'], 2); + $data['not_total_refund_amount'] = bcsub($data['signed_amount'], $data['total_refund_amount'], 2); //开票未回款金额 $invoice_has_refund_amount = FinancialRefund::where('contract_id', $data['id'])->where('invoice_id', 'in', $invoice_ids)->sum('amount'); $data['invoice_not_refund_amount'] = bcsub($data['total_invoice_amount'], $invoice_has_refund_amount, 2); @@ -102,7 +102,7 @@ $data['is_settlement'] = 0; //未结算 $data['settlement_date'] = ''; } else { - if ($data['total_settlement_amount'] >= $data['money']) { + if ($data['total_settlement_amount'] >= $data['signed_amount']) { $data['is_settlement'] = 2; //已结算 } else { $data['is_settlement'] = 1; //部分结算 diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index 7758950cb..acfb616fb 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -86,11 +86,11 @@ //开票金额 $data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['id'])->sum('apply_amount'); //未开票金额 - $data['not_total_invoice_amount'] = bcsub($data['money'], $data['total_invoice_amount'], 2); + $data['not_total_invoice_amount'] = bcsub($data['signed_amount'], $data['total_invoice_amount'], 2); //到账金额 $data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['id'])->sum('amount'); //未到账金额 - $data['not_total_refund_amount'] = bcsub($data['money'], $data['total_refund_amount'], 2); + $data['not_total_refund_amount'] = bcsub($data['signed_amount'], $data['total_refund_amount'], 2); //开票未回款金额 $invoice_has_refund_amount = FinancialRefund::where('contract_id', $data['id'])->where('invoice_id', 'in', $invoice_ids)->sum('amount'); $data['invoice_not_refund_amount'] = bcsub($data['total_invoice_amount'], $invoice_has_refund_amount, 2); @@ -103,7 +103,7 @@ $data['is_settlement'] = 0; $data['settlement_date'] = ''; } else { - if ($data['total_settlement_amount'] >= $data['money']) { + if ($data['total_settlement_amount'] >= $data['signed_amount']) { $data['is_settlement'] = 2; } else { $data['is_settlement'] = 1;