修改破损工单Request 校验

app/Http/Controllers/WorkOrderController.php

@@ -3,13 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Filters\WorkOrderFilters;
+use App\Http\Requests\WorkOrder\WorkOrderRequest;
 use App\Logistic;
 use App\OrderIssue;
-use App\OrderIssueType;
-use App\Services\OwnerService;
 use App\Services\WorkOrderService;
 use App\WorkOrder;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
 
@@ -77,7 +75,7 @@ class WorkOrderController extends Controller
     }
 
     // 破损工单
-    public function damagedApi(Request $request, WorkOrderService $service): array
+    public function damagedApi(WorkOrderRequest $request, WorkOrderService $service): array
     {
         if (Gate::denies('订单管理-订单-生成工单'))
             return ['success' => false, 'message' => '没有对应权限'];
@@ -92,11 +90,18 @@ class WorkOrderController extends Controller
     // 遗失工单信息 填充
     public function updateLossApi(Request $request, WorkOrderService $service): array
     {
+        if (Gate::denies('订单管理-工单处理-货主编辑'))
+            return ['success' => false, 'message' => '没有对应权限'];
+
         /** @var WorkOrder $workOrder */
         $workOrder = WorkOrder::query()->where('id',$request->input('id'))->first();
+
         if (!$workOrder) return ['success' => false,'message' => '参数异常'];
+
         $workOrder = $service->fillLossWorkOrder($workOrder,$request->all());
+
         if(!$workOrder) return ['success' => false,'message' => '创建异常'];
+
         return ['success' => true, 'data' => $workOrder];
     }
 

resources/views/order/index/delivering.blade.php

@@ -1348,7 +1348,14 @@
                             window.tempTip.showSuccess('工单生成成功');
                             $('#intercept-modal').modal('hide');
                         } else {
-                            window.tempTip.show(res.data.message ? res.data.message : '工单创建异常');
+                            if (res.data.errors){
+                                for (const resKey in res.data.errors) {
+                                    window.tempTip.show(res.data.errors[resKey]);
+                                    return ;
+                                }
+                            }else{
+                                window.tempTip.show(res.data.message ? res.data.message : '工单创建异常');
+                            }
                         }
                     }).catch(err => {
                         window.tempTip.show(err)