Эх сурвалжийг харах

问题件回收bug修改
删除后页面显示报错
二次订单号和退回单号显示异常

ajun 5 жил өмнө
parent
commit
00a6f2c927

+ 1 - 1
app/Services/OrderIssueService.php

@@ -619,7 +619,7 @@ class OrderIssueService
                 $query->with(['logistic','shop','owner','packages'=>function($query){
                 $query->with('commodities');
             }]);
-        },'rejectedBill.items','issueType','secondOrder.packages.commodities'])->onlyTrashed()->paginate($params['paginate'] ?? 50);
+        },'orderIssueRejectedBills.rejectedBill.items','issueType','secondOrder.packages.commodities'])->onlyTrashed()->paginate($params['paginate'] ?? 50);
     }
 
     public function recoverOrderIssue($ids)

+ 6 - 8
resources/views/order/issue/recycle.blade.php

@@ -79,9 +79,9 @@
                                 </div>
                             </td>
                             <td>
-                                <div v-if="orderIssue.secondOrder">
-                                    <div v-if="orderIssue.secondOrder.packages">
-                                        <p v-for="package in orderIssue.secondOrder.packages">@{{ package.logistic_number }}</p>
+                                <div v-if="orderIssue.order_issue_rejected_bills">
+                                    <div v-for="orderIssueRejectedBill in orderIssue.order_issue_rejected_bills">
+                                        <p>@{{ orderIssueRejectedBill.logistic_number_return }}</p>
                                     </div>
                                 </div>
                             </td>
@@ -159,11 +159,9 @@
                             tempTip.setDuration(2000);
                             if (response.data.success) {
                                 tempTip.showSuccess('恢复成功');
-                                for (let i = 0; i < _this.orderIssues.length; i++) {
-                                    if(data.ids.includes(orderIssue.id))
-                                        _this.orderIssues.splice(i,1);
-
-                                }
+                                _this.orderIssues.forEach(function(item,index){
+                                    if(_this.checkData.includes(item.id)) _this.orderIssues.splice(index,1);
+                                })
                             } else {
                                 tempTip.show(response.data.error);
                             }