diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index 8c96764..94601d7 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -151,7 +151,7 @@ class WorkorderController extends AdminController return $this->error('上传图片格式错误'); } - $path = $request->image->store('images/workorder'); + $path = $request->image->store('public/images/workorder'); return $this->jsonSuccess(['path' => config('filesystems.disks.public.url') . '/' . $path]); } @@ -190,6 +190,7 @@ class WorkorderController extends AdminController return $this->jsonFailValidated('数据不全:'.$validator->errors()->first()); } $data = WorkorderItem::query() + ->with('publisher') ->where('workorder_id',request('workorder_id',0)) ->orderBy('created_at') ->get(); diff --git a/app/Models/Workorder.php b/app/Models/Workorder.php index ac35c1e..47a7b65 100755 --- a/app/Models/Workorder.php +++ b/app/Models/Workorder.php @@ -22,4 +22,9 @@ class Workorder extends Model { return $this->morphTo(); } + + public function items() + { + return $this->hasMany(WorkorderItem::class,'workorder_id','id'); + } } diff --git a/app/Models/WorkorderItem.php b/app/Models/WorkorderItem.php index f953bd5..dfd4933 100755 --- a/app/Models/WorkorderItem.php +++ b/app/Models/WorkorderItem.php @@ -12,5 +12,9 @@ class WorkorderItem extends Model use SoftDeletes; protected $table = 'workorder_item'; - + + public function publisher() + { + return $this->morphTo(); + } }