拦截工单添加问题描述

app/Services/WorkOrderService.php

@@ -62,7 +62,7 @@ class WorkOrderService
         return ['success' => true];
     }
 
-    public function createAndNotification($order, $orderIssueType, $remake): WorkOrder
+    public function createAndNotification($order, $orderIssueType, $remark): WorkOrder
     {
         $user = Auth::user();
         /** @var WorkOrder $workOrder */
@@ -70,7 +70,7 @@ class WorkOrderService
             'order_id' => $order->id,
             'creator_id' => $user["id"],
             'owner_id' => $order->owner_id,
-            'remark' => $remake,
+            'remark' => $remark,
             'outer_table_name' => 'orders',
             'order_issue_type_id' => $orderIssueType->id,
             'uniquely_tag' => $order->code,
@@ -88,8 +88,8 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '拦截']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = '拦截订单';
-        return $this->createAndNotification($order, $orderIssueType, $remake);
+        $remark = $param['remark'];
+        return $this->createAndNotification($order, $orderIssueType, $remark);
     }
 
     /**
@@ -99,8 +99,8 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '错漏发']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
-        return $this->createAndNotification($order, $orderIssueType, $remake);
+        $remark = $param['remark'] ?? '';
+        return $this->createAndNotification($order, $orderIssueType, $remark);
     }
 
     /**
@@ -110,11 +110,11 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '破损']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
+        $remark = $param['remark'] ?? '';
 
         $workOrderImageService = app('WorkOrderImageService');
 
-        $workOrder = $this->createAndNotification($order, $orderIssueType, $remake);
+        $workOrder = $this->createAndNotification($order, $orderIssueType, $remark);
 
         $workOrderImageService->createWorkOrderPackageImages($workOrder, $param['packageImages']);
 
@@ -138,8 +138,8 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '快递异常']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
-        return $this->createAndNotification($order, $orderIssueType, $remake);
+        $remark = $param['remark'] ?? '';
+        return $this->createAndNotification($order, $orderIssueType, $remark);
     }
 
     /***
@@ -149,9 +149,9 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '信息更改']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
+        $remark = $param['remark'] ?? '';
 
-        $workOrder = $this->createAndNotification($order, $orderIssueType, $remake);
+        $workOrder = $this->createAndNotification($order, $orderIssueType, $remark);
 //        $workOrder->update(['work_order_status' => ]); // 标记信息已填写
 
         return $workOrder;
@@ -164,8 +164,8 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '其他']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
-        return $this->createAndNotification($order, $orderIssueType, $remake);
+        $remark = $param['remark'] ?? '';
+        return $this->createAndNotification($order, $orderIssueType, $remark);
     }
 
     /**
@@ -175,8 +175,8 @@ class WorkOrderService
     {
         $orderIssueType = OrderIssueType::query()->firstOrCreate(['name' => '快递丢件']);
         $order = Order::query()->where('code', $param['order_no'])->first();
-        $remake = $param['remark'] ?? '';
-        $workOrder = $this->createAndNotification($order, $orderIssueType, $remake);
+        $remark = $param['remark'] ?? '';
+        $workOrder = $this->createAndNotification($order, $orderIssueType, $remark);
         $workOrder->update(['work_order_status' => 1]); // 标记信息未填写
         return $workOrder;
     }

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

@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 {{--其他--}}
-                <div class="form-group row" v-if="['其他',null,'快递异常','错漏发','破损','快递丢件'].includes(workOrder.orderIssueType)">
+                <div class="form-group row" v-if="['其他',null,'快递异常','错漏发','破损','快递丢件','拦截'].includes(workOrder.orderIssueType)">
                     <hr>
                     <label for="remake_info" class="col-sm-2 col-form-label text-right">问题描述</label>
                     <div class="col-sm-10">