Просмотр исходного кода

修改问题件退回件快递单号添加删除时的显示问题

ajun 5 лет назад
Родитель
Сommit
154898d1c3

+ 2 - 1
app/Services/OrderIssueRejectedBillService.php

@@ -26,7 +26,7 @@ Class OrderIssueRejectedBillService
         if(!OrderIssueRejectedBill::isExit($orderIssue->id,$logistic_number_return)) $orderIssue->update(['is_new_rejecting' => '有']);
         $orderIssue->joinRejectedBill($logistic_number_return);
         $orderIssue->syncRejectingStatus();      // 问题件同步订单状态
-        return OrderIssueRejectedBill::query()->with('rejectedBill')
+        return OrderIssueRejectedBill::query()->with('rejectedBill.items')
                 ->where('order_issue_id',$orderIssue->id)
                 ->where('logistic_number_return',$logistic_number_return)->first() ?? false;
     }
@@ -46,6 +46,7 @@ Class OrderIssueRejectedBillService
 
         $bool = $orderIssue->unJoinRejectedBill($logistic_number_return);
         $orderIssue->syncRejectingStatus();      // 问题件同步订单状态
+        if($orderIssue->rejectedBills->count() == 0)$orderIssue->update(['is_new_rejecting' => '无']);
         return $bool;
     }
 

+ 6 - 11
resources/views/order/issue/index.blade.php

@@ -347,16 +347,6 @@
                                             </tr>
                                         </template>
                                     </template>
-{{--                                    <tr class="align-center" v-for="item in orderIssue.rejected_bill.items" @click="removeFocusing($event)" v-show="isShowRejectedBill">--}}
-{{--                                        <td style="min-width: 75px">@{{ item.barcode_goods }}</td>--}}
-{{--                                        <td style="min-width: 100px">--}}
-{{--                                            <div class="text-truncate text-primary tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开" @dblclick="nowrapText($event)">@{{ item.name_goods }}</div>--}}
-{{--                                            <div class="text-nowrap m-0 p-0 tooltipTarget"  style="display: none;cursor:pointer" @dblclick="truncateText($event)" title="双击收起">@{{ item.name_goods }}</div>--}}
-{{--                                        </td>--}}
-{{--                                        <td style="min-width: 50px">@{{ item.amount }}</td>--}}
-{{--                                        <td style="min-width: 50px">@{{ item.quality_label }}</td>--}}
-{{--                                        <td style="min-width: 100px">@{{ item.remark }}</td>--}}
-{{--                                    </tr>--}}
                                 </table>
                                 <button v-if="orderIssue.rejected_bill_type_numbers > 1" type="button" class="btn btn-sm btn-outline-primary align-middle mt-1" :id="'rejectedBillBtn'+orderIssue.id"
                                         data-toggle="collapse" :data-target="'#rejectedBill'+orderIssue.id" @click="toggleRejectedBill(orderIssue.id,orderIssue.rejected_bill_amounts)">
@@ -1575,11 +1565,16 @@
                                 tempTip.showSuccess('退回单号取消关联成功');
                                 if(orderIssue.rejected_bills===null)return;
                                 $.each(orderIssue.order_issue_rejected_bills,function(i,item){
-                                    if(item.rejected_bill.logistic_number_return === logistic_number){
+                                    if(item.logistic_number_return === logistic_number){
                                         orderIssue.order_issue_rejected_bills.splice(i,1);
                                         _this.regroupRejectedBill(orderIssue);
                                     }
                                 });
+                                if(response.data.orderIssue){
+                                    orderIssue.rejecting_status =response.data.orderIssue.rejecting_status;
+                                    orderIssue.is_new_rejecting =response.data.orderIssue.is_new_rejecting;
+                                }
+                                _this.$forceUpdate();
                                 return;
                             }
                             tempTip.setDuration(2000);