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-03-19 11:38:14 +08:00
parent 0f6b4ef5ab
commit 0abd502578
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/ProjectCommissionDetailLists.php
View File

@ -61,6 +61,8 @@ class ProjectCommissionDetailLists extends BaseAdminDataLists implements ListsSe
->select()->each(function($data){ ->select()->each(function($data){
$project_commission = ProjectCommission::field('num')->where('id',$data['project_commission_id'])->findOrEmpty(); $project_commission = ProjectCommission::field('num')->where('id',$data['project_commission_id'])->findOrEmpty();
$data['project_commission_num'] = $project_commission['num']; $data['project_commission_num'] = $project_commission['num'];
$data['task_type_text'] = $data->task_type_text;
$data['professional_type_text'] = $data->professional_type_text;
}) })
->toArray(); ->toArray();
} }

5
app/adminapi/logic/ProjectCommissionDetailLogic.php
View File

@ -124,6 +124,9 @@ class ProjectCommissionDetailLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return ProjectCommissionDetail::findOrEmpty($params['id'])->toArray(); $data = ProjectCommissionDetail::findOrEmpty($params['id']);
$data['task_type_text'] = $data->task_type_text;
$data['professional_type_text'] = $data->professional_type_text;
return $data->toArray();
} }
} }

5
app/adminapi/logic/ProjectCommissionLogic.php
View File

@ -152,7 +152,10 @@ class ProjectCommissionLogic extends BaseLogic
$data['total_pay_amount'] = ProjectCommission::where('project_id',$data['project_id'])->sum('bczfze'); $data['total_pay_amount'] = ProjectCommission::where('project_id',$data['project_id'])->sum('bczfze');
//应提成总金额 //应提成总金额
$data['total_commission_amount'] = $data['total_refund_amount'] * ($data['rate'] / 100); $data['total_commission_amount'] = $data['total_refund_amount'] * ($data['rate'] / 100);
$data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->toArray(); $data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->each(function($data){
$data['task_type_text'] = $data->task_type_text;
$data['professional_type_text'] = $data->professional_type_text;
})->toArray();
return $data; return $data;
} }