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:18:10 +08:00
parent 1d4e60caf9
commit 61b53d29db
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/financial/FinancialInvoiceLists.php
View File

@ -68,7 +68,7 @@
$custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a_name'] = $custom['name']; $data['part_a'] = $custom['name'];
$data['part_b'] = $contract['part_b']; $data['part_b'] = $contract['part_b'];
$data['sign_money'] = $contract['signed_amount']; $data['sign_money'] = $contract['signed_amount'];
$data['sign_time'] = $contract['create_time']; $data['sign_time'] = $contract['create_time'];

2
app/adminapi/lists/financial/FinancialRefundLists.php
View File

@ -65,7 +65,7 @@
->select()->each(function ($data) { ->select()->each(function ($data) {
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b')->where('id', $data['contract_id'])->findOrEmpty();
$invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];

2
app/adminapi/logic/financial/FinancialInvoiceLogic.php
View File

@ -140,7 +140,7 @@
$data['invoice_type_text'] = $data->invoice_type_text; $data['invoice_type_text'] = $data->invoice_type_text;
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a_name'] = $custom['name']; $data['part_a'] = $custom['name'];
$data['part_b'] = $contract['part_b']; $data['part_b'] = $contract['part_b'];
$data['sign_money'] = $contract['signed_amount']; $data['sign_money'] = $contract['signed_amount'];
$data['sign_time'] = $contract['create_time']; $data['sign_time'] = $contract['create_time'];

2
app/adminapi/logic/financial/FinancialRefundLogic.php
View File

@ -120,7 +120,7 @@
$data = FinancialRefund::withoutField('update_time,delete_time')->findOrEmpty($params['id']); $data = FinancialRefund::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name,contract_type,part_a,part_b,signed_amount,create_time')->where('id', $data['contract_id'])->findOrEmpty();
$invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty(); $invoice = FinancialInvoice::field('invoice_code,apply_amount')->where('id', $data['invoice_id'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty(); $custom = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];
$data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : ''; $data['contract_type'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$data['part_a'] = $custom['name']; $data['part_a'] = $custom['name'];