工单处理 修改审核问题

app/Services/WorkOrderService.php

@@ -7,9 +7,7 @@ use App\OrderIssue;
 use App\OrderIssueType;
 use App\OrderPackage;
 use App\Traits\ServiceAppAop;
-use App\User;
 use App\WorkOrder;
-use App\WorkOrderType;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Carbon;
@@ -191,10 +189,11 @@ class WorkOrderService
     public function review($wordOrder): array
     {
         $wordOrder->update(['reviewer_id' => Auth::user()['id'], 'review_at' => Carbon::now(), 'status' => '2',]);
-        $workOrders = WorkOrder::query()->with(['type', 'creator', 'order' => function ( $query) {
-            /** @var Builder $query */
-            $query->with('packages', 'issue', 'logistic');
-        }, 'reviewer'])->whereIn('id', [$wordOrder['id']])->get();
+        $workOrders = WorkOrder::query()->defaultWith()->whereIn('id',[$wordOrder['id']])->get();
+//        $workOrders = WorkOrder::query()->with(['type', 'creator', 'order' => function ( $query) {
+//            /** @var Builder $query */
+//            $query->with('packages', 'issue', 'logistic');
+//        }, 'reviewer'])->whereIn('id', [$wordOrder['id']])->get();
         $this->tags($workOrders);
         return ['success' => true, 'data' => $workOrders->first()];
     }
@@ -210,11 +209,7 @@ class WorkOrderService
             return $item->id;
         })->toArray();
         WorkOrder::query()->whereIn('id', $ids)->update(['review_at' => Carbon::now(), 'reviewer_id' => Auth::user()['id'], 'status' => '2']);
-        $wordOrders = WorkOrder::query()->with(['type', 'creator', 'order' => function ($query) {
-            /** @var Builder $query */
-            $query->with('packages', 'issue', 'logistic');
-        }, 'reviewer'])->whereIn('id', $ids)->get();
-        $this->tags($wordOrders);
+        $wordOrders = WorkOrder::query()->defaultWith()->whereIn('id',$ids)->get();
         return ['success' => true, 'data' => $wordOrders];
     }
 

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

@@ -136,7 +136,7 @@
                                                 <tr class="table table-sm">
                                                     <td>@{{ item.issue_logs[0].content }}</td>
                                                     <td>@{{ item.issue_logs[0].username }}</td>
-                                                    <td>@{{ item.issue_logs[0].created_at }}</td>
+                                                    <td>@{{ item.issue_logs[0].created_at | dataTime}}</td>
                                                 </tr>
                                             </table>
                                         </template>
@@ -147,7 +147,7 @@
                                                     <tr v-for="log in item.issue_logs">
                                                         <td>@{{ log.content }}</td>
                                                         <td>@{{ log.username }}</td>
-                                                        <td>@{{ log.created_at }}</td>
+                                                        <td>@{{ log.created_at | dataTime}}</td>
                                                     </tr>
                                                 </table>
                                             </transition>
@@ -156,7 +156,7 @@
                                                     <tr>
                                                         <td>@{{ item.issue_logs[0].content }}</td>
                                                         <td>@{{ item.issue_logs[0].username }}</td>
-                                                        <td>@{{ item.issue_logs[0].created_at }}</td>
+                                                        <td>@{{ item.issue_logs[0].created_at | dataTime}}</td>
                                                     </tr>
                                                 </table>
                                             </transition>
@@ -201,10 +201,10 @@
                                         </div>
                                     </template>
                                 </td>
-                                <td class="text-center">@{{ item.creator.name }}</td>
-                                <td class="text-center">@{{ item.created_at }}</td>
+                                <td class="text-center">@{{ item.creator ? item.creator.name : '' }}</td>
+                                <td class="text-center">@{{ item.created_at | dataTime}}</td>
                                 <td>@{{ item.reviewer ? item.reviewer.name : ''}}</td>
-                                <td>@{{ item.review_at }}</td>
+                                <td>@{{ item.review_at |dataTime}}</td>
                                 @can('订单管理-工单处理-删除')
                                     <td>
                                         <button class="btn btn-sm btn-outline-danger"
@@ -375,6 +375,14 @@
                     this.sortOrder(item);
                 });
             },
+            filters:{
+                dataTime:function(value) {
+                    if (value !== null) {
+                        return moment(value).format('yyyy-MM-DD');
+                    }
+                    return value
+                },
+            },
             methods: {
                 sortOrder(workOrder) {
                     if (!workOrder.order) return;