diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php index a46a1428d..c6f0e8173 100644 --- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php +++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php @@ -130,7 +130,7 @@ }; $data['project_id'] = $project['id']; $rate = bcdiv($data['total_refund_amount'], $data['signed_amount'], 2); - $data['refund_rate'] = ($rate * 100).'%'; + $data['refund_rate'] = ($rate * 100); }) ->toArray(); $count = MarketingContract::where($where)->where('status', 1)->count(); diff --git a/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php b/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php index b70e06693..aa1c26db6 100644 --- a/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php +++ b/app/adminapi/lists/marketing/MarketingFrameworkAgreementLists.php @@ -78,6 +78,8 @@ $data['contract_type_text'] = $data->contract_type_text; $data['review_status_text'] = '不可移交';//$data->review_status_text; $data['approve_check_status_text'] = $data->approve_check_status_text; + $contract = MarketingContract::where('related_contract_id',$data['id'])->findOrEmpty(); + $data['is_generate'] = !$contract->isEmpty() ? 1 : 0; }) ->toArray(); }