mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-04-16 11:41:15 +08:00
parent b7a0fd3cd3
commit 7a56fc1935
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/controller/cost_project/CostApprovedProjectController.php
View File

@ -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; //部分结算

6
app/adminapi/lists/cost_project/CostApprovedProjectLists.php
View File

@ -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;