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-05-16 13:36:15 +08:00
parent 23cc8cc5ef
commit 5b27fca934
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/adminapi/lists/cost_project/CostProjectLists.php
View File

@ -114,20 +114,20 @@
$admin = Admin::field('name')->where('id', $res['principal'])->findOrEmpty();
$custom = MarketingCustom::field('name')->where('id', $res['aunit'])->findOrEmpty();
$part_a = MarketingCustom::field('name')->where('id', $contract['part_a'])->findOrEmpty();
$res['contract_name'] = $contract?->contract_name;
$res['contract_type_text'] = $contract?->contract_type_text;
$res['part_a_name'] = $part_a?->name;
$res['part_b'] = $contract?->part_b;
$res['signed_amount'] = $contract?->signed_amount;
$res['signed_date'] = $contract?->create_time;
$res['contract_name'] = !$contract->isEmpty() ? $contract['contract_name'] : '';
$res['contract_type_text'] = !$contract->isEmpty() ? $contract->contract_type_text : '';
$res['part_a_name'] = !$part_a->isEmpty() ? $part_a['name'] : '';
$res['part_b'] = !$contract->isEmpty() ? $contract['part_b'] : '';
$res['signed_amount'] = !$contract->isEmpty() ? $contract['signed_amount'] : '';
$res['signed_date'] = !$contract->isEmpty() ? $contract['create_time'] : '';
$res['types_text'] = $res->types_text;
$res['industry_text'] = $res->industry_text;
$res['province_name'] = $province?->province_name;
$res['city_name'] = $city?->city_name;
$res['dept_name'] = $dept?->name;
$res['principal_name'] = $admin?->name;
$res['province_name'] = !$province->isEmpty() ? $province['province_name'] : '';
$res['city_name'] = !$city->isEmpty() ? $city['city_name'] : '';
$res['dept_name'] = !$dept->isEmpty() ? $dept['name'] : '';
$res['principal_name'] = !$admin->isEmpty() ? $admin['name'] : '';
$res['person_text'] = $res->person_text;
$res['aunit_name'] = $custom?->name;
$res['aunit_name'] = !$custom->isEmpty() ? $custom['name'] : '';
$res['total_invoice_amount'] = ZjzxInvoice::where('project_id', $res['id'])->sum('apply_amount');
$res['total_refund_amount'] = ZjzxRefund::where('project_id', $res['id'])->sum('amount');
$res['total_pay_amount'] = ProjectCommission::where('project_id', $res['id'])->sum('bczfze');

4
app/adminapi/logic/cost_project/CostProjectLogic.php
View File

@ -87,8 +87,8 @@
'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]);
if ($params['contract'] > 0) {
MarketingContract::where('id', $params['contract'])->update(['status' => 1]);
if ($params['contract_id'] > 0) {
MarketingContract::where('id', $params['contract_id'])->update(['status' => 1]);
}
Db::commit();
return true;