From 759a93de25e4c6f5bca779bd8f4027dbcf7fa241 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 8 Jan 2024 09:46:39 +0800 Subject: [PATCH] fixed --- app/adminapi/lists/contract/ContractLists.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php index 36485959b..2a6d09f6a 100644 --- a/app/adminapi/lists/contract/ContractLists.php +++ b/app/adminapi/lists/contract/ContractLists.php @@ -22,6 +22,8 @@ use app\common\model\contract\Contract; use app\common\lists\ListsSearchInterface; use app\common\model\contract\ContractNegotiation; use app\common\model\custom\Custom; +use app\common\model\finance\FinanceInvoiceApply; +use app\common\model\finance\FinanceRefundApply; use app\common\model\finance\FinanceReturnedRecord; use app\common\model\project\Project; use think\facade\Db; @@ -92,10 +94,22 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface $data['contract_status_text'] = $data->contract_status_text; $data['contract_pricing_method_text'] = $data->contract_pricing_method_text; $data['business_director_name'] = $business_director['name']; + //洽商金额 $data['negotiation_amount'] = ContractNegotiation::where('contract_id',$data['id'])->sum('negotiation_amount'); - $data['reality_contract_amount'] = $data['amount'] + $data['negotiation_amount']; + //回款金额 $data['returned_amount'] = FinanceReturnedRecord::where('contract_id',$data['id'])->sum('amount'); + //开票金额 + $data['invoicing_amount'] = FinanceInvoiceApply::where('contract_id',$data['id'])->sum('invoicing_amount'); + //退款金额 + $data['refund_amount'] = FinanceRefundApply::where('contract_id',$data['id'])->sum('amount'); + //实际合同金额=合同金额+洽商金额-退款金额 + $data['reality_contract_amount'] = $data['amount'] + $data['negotiation_amount'] - $data['refund_amount']; + //未回款金额 $data['not_returned_amount'] = $data['reality_contract_amount'] - $data['returned_amount']; + //未开票金额 + $data['not_invoicing_amount'] = $data['reality_contract_amount'] - $data['invoicing_amount']; + //结算差异（带计算） + $data['settlement_difference'] = 0; return $data; }) ->toArray();