修改卸货任务的服务商指向

app/DischargeTask.php

@@ -35,7 +35,7 @@ class DischargeTask extends Model
     protected $fillable = [
         'owner_id','type','numbers','status',
         'income_amount','income_unit','income_unit_price','income_total_cost','income_remark',
-        'discharge_provider_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark',
+        'facilitator_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark',
     ];
 
     function owner(): BelongsTo
@@ -43,9 +43,9 @@ class DischargeTask extends Model
         return $this->belongsTo(Owner::class);
     }
 
-    function dischargeProvider(): BelongsTo
+    function facilitator(): BelongsTo
     {
-        return $this->belongsTo(DischargeProvider::class);
+        return $this->belongsTo(Facilitator::class);
     }
 
     public function scopeFilter($query, $filters)

app/Filters/DischargeTaskFilters.php

@@ -4,16 +4,14 @@
 namespace App\Filters;
 
 
-use App\DischargeProvider;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\Request;
+  use Illuminate\Http\Request;
 
 class DischargeTaskFilters
 {
     protected $request;
     protected $queryBuilder;
     protected $filters = [
-        'owner_id', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','discharge_provider_id'
+        'owner_id', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitator_id'
     ];
     protected $array_filter;
     protected $params = [];
@@ -101,9 +99,9 @@ class DischargeTaskFilters
         $this->queryBuilder->whereIn('id',$ids);
     }
 
-    public function discharge_provider_id($discharge_provider_id)
+    public function facilitator_id($facilitator_id)
     {
-        $this->searchWay($this->queryBuilder,$discharge_provider_id,'discharge_provider_id');
+        $this->searchWay($this->queryBuilder,$facilitator_id,'facilitator_id');
     }
 
 }

app/Http/Controllers/DischargeTaskController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Components\AsyncResponse;
-use App\DischargeProvider;
+use App\Facilitator;
 use App\DischargeTask;
 use App\Filters\DischargeTaskFilters;
 use App\Services\common\ExportService;
@@ -16,21 +16,20 @@ class DischargeTaskController extends Controller
     public function index(Request  $request,DischargeTaskFilters  $filters)
     {
         // 权限 ***
-
-        $dischargeTasks = DischargeTask::query()->with(['dischargeProvider','owner'])->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
+        $dischargeTasks = DischargeTask::query()->with(['facilitator','owner'])->filter($filters)->orderByDesc('id')->paginate($request['paginate'] ?? 50);
         $owners = app(OwnerService::class)->getAuthorizedOwners();
-        $dischargeProviders = DischargeProvider::query()->select('name','id')->get();
-        return view('transport.discharge.task.index',compact('dischargeTasks','owners','dischargeProviders'));
+        $facilitators = Facilitator::query()->select('name','id')->get();
+        return view('transport.discharge.task.index',compact('dischargeTasks','owners','facilitators'));
     }
 
     // 结算报表
     public function statementIndex(Request $request,DischargeTaskFilters $filters)
     {
         // 权限 ***
-        $dischargeStatements  = DischargeTask::query()->with('dischargeProvider')->filter($filters)->orderBy('id')->paginate($request['paginate'] ?? 50);
+        $dischargeStatements  = DischargeTask::query()->with('facilitator')->filter($filters)->orderBy('id')->paginate($request['paginate'] ?? 50);
         $owners = app(OwnerService::class)->getAuthorizedOwners();
-        $providers = DischargeProvider::query()->select('name','id')->get();
-        return view('transport.discharge.statement.index',compact('dischargeStatements','owners','providers'));
+        $facilitators = Facilitator::query()->select('name','id')->get();
+        return view('transport.discharge.statement.index',compact('dischargeStatements','owners','facilitators'));
     }
 
 
@@ -119,7 +118,7 @@ class DischargeTaskController extends Controller
     // 卸货任务文件下载
     public function export(Request $request,DischargeTaskFilters $filters)
     {
-        $dischargeTasks = DischargeTask::query()->with(['dischargeProvider','owner'])->filter($filters)->orderByDesc('id')->get();
+        $dischargeTasks = DischargeTask::query()->with(['Facilitator','owner'])->filter($filters)->orderByDesc('id')->get();
         $row = ['日期','客户名称','作业名称','入库单号','数量','单位','单价','收费','状态','备注'];
         $json =  app('DischargeTaskService')->getJson($dischargeTasks);
         return app(ExportService::class)->json($row,$json,"卸货任务");
@@ -128,7 +127,7 @@ class DischargeTaskController extends Controller
     // 结算报表下载
     public function exportStatements(Request $request,DischargeTaskFilters $filters)
     {
-        $dischargeTasks = DischargeTask::query()->with(['dischargeProvider','owner'])->filter($filters)->orderByDesc('id')->get();
+        $dischargeTasks = DischargeTask::query()->with(['facilitator','owner'])->filter($filters)->orderByDesc('id')->get();
         $row = ['日期','客户名称','作业名称','入库单号','数量','单位','收入单价','收入合计','服务商','数量','单位','支出单价','支出合计','状态','收入备注','支出备注'];
         $json =  app('DischargeTaskService')->getStatementsJson($dischargeTasks);
         return app(ExportService::class)->json($row,$json,"卸货结算报表");