Ver Fonte

工单显示

zengjun há 3 anos atrás
pai
commit
eec4f4dc9f

+ 1 - 1
app/OrderIssueRejectedBill.php

@@ -23,7 +23,7 @@ class OrderIssueRejectedBill extends Model
 
     public function workOrder(): BelongsTo
     {
-        return $this->belongsTo(OrderIssue::class,'order_id','order_id');
+        return $this->belongsTo(WorkOrder::class,'order_id','order_id');
     }
 
     public function orderIssue(): BelongsTo

+ 12 - 9
resources/views/rejected/search/general.blade.php

@@ -64,15 +64,18 @@
                         </td>
                         <td class="text-nowrap">
                             <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span>
-                            <br/>
-                            <span v-if="rejectedBill.order_issue_rejected_bill" class="badge badge-pill badge-danger">
-                                @{{rejectedBill.order_issue_rejected_bill.order_issue ? rejectedBill.order_issue_rejected_bill.order_issue.issue_type.name : '问题件'}}
-                            </span>
-                            <br/>
-                            <span v-if="rejectedBill.order_issue_rejected_bill"
-                                  class="badge badge-pill badge-info text-white">
-                                @{{rejectedBill.order_issue_rejected_bill.work_order ? rejectedBill.order_issue_rejected_bill.work_order.issue_type.name : '工单'}}
-                            </span>
+                            <template v-if="rejectedBill.order_issue_rejected_bill">
+                                <br v-if="rejectedBill.order_issue_rejected_bill.order_issue"/>
+                                <span v-if="rejectedBill.order_issue_rejected_bill.order_issue"
+                                      class="badge badge-pill badge-danger"
+                                      v-text="rejectedBill.order_issue_rejected_bill.order_issue.issue_type.name">
+                                </span>
+                                <br v-if="rejectedBill.order_issue_rejected_bill.work_order"/>
+                                <span v-if="rejectedBill.order_issue_rejected_bill.work_order"
+                                      class="badge badge-pill badge-info text-white"
+                                      v-text="rejectedBill.order_issue_rejected_bill.work_order.issue_type.name">
+                                </span>
+                            </template>
                         </td>
                         <td class="text-muted text-center">
                             <span v-if="rejectedBill.is_checked==1">