快递 is_new_rejecting 筛选

app/Filters/OrderPackageFilters.php

@@ -32,6 +32,7 @@ class OrderPackageFilters
         'sent_at_end',
         'default_date',
         'has_transfer_status',
+        'is_new_rejecting',
     ];
 
     protected $orderIssueQuery;
@@ -149,15 +150,11 @@ class OrderPackageFilters
     {
         if ($is_issue === '是') {
             $this->queryBuilder->whereIn('order_id', function ($query) {
-                $query->from('orders')->select('id')->whereIn('id', function ($query) {
-                    $query->from('order_issues')->select('order_id')->whereNotNull('order_id');
-                });
+                $query->from('order_issues')->select('order_id')->whereNotNull('order_id');
             });
         } else {
             $this->queryBuilder->whereIn('order_id', function ($query) {
-                $query->from('orders')->select('id')->whereNotIn('id', function ($query) {
-                    $query->from('order_issues')->select('order_id')->whereNotNull('order_id');
-                });
+                $query->from('order_issues')->select('order_id')->whereNotNull('order_id');
             });
         }
     }
@@ -173,4 +170,11 @@ class OrderPackageFilters
             $query->from('order_package_remarks')->select('order_package_id')->where('content', 'like', $remark);
         });
     }
+
+    public function is_new_rejecting($is_new_rejecting)
+    {
+        $this->queryBuilder->whereIn('order_id', function ($query) use ($is_new_rejecting) {
+            $query->from('order_issues')->select('order_id')->where('is_new_rejecting', $is_new_rejecting);
+        });
+    }
 }

resources/views/package/logistic/index.blade.php

@@ -132,6 +132,7 @@
                     <td>@{{ package.received_at }}</td>
                     <td>@{{ package.weighed_at }}</td>
                     <td>
+
                         <div v-if="package.transfer_status && package.transfer_status.length>0"
                              class="text-overflow-warp-200 up" :id="'route-'+i">
                             <p v-for="route in package.transfer_status">
@@ -150,6 +151,8 @@
                             </label>
                         </div>
                     </td>
+                    <!--退件状态-->
+                    <td>@{{ package.order.issue?package.order.issue.is_new_rejecting:'' }}</td>
                     <td  class="m-0 p-0 order-package-remarks" style="padding-left: 0 !important;padding-right: 0 !important">
                         @can('包裹管理-快递-客服备注')
                         <label :for="'create_remark_'+package.id" class="btn-create-remark" @click="package.input_remark=!package.input_remark">
@@ -258,9 +261,20 @@
                 showRemarkList: {},
                 selectTr: 0,
                 statuses: [
+                    '无',
+                    '已称重',
                     '已揽收',
+                    '揽件异常',
+                    '疑似库内丢件',
                     '在途',
-                    '无',
+                    '在途异常',
+                    '派送中',
+                    '派送异常',
+                    '返回中',
+                    '返回异常',
+                    '返回派件',
+                    '其他异常',
+                    '已签收',
                 ],
                 batchStatus: null,
                 remarkHover: null,
@@ -363,6 +377,13 @@
                             placeholder: '是否为问题件',
                             data: [{name: '是', value: '是'}, {name: '否', value: '否'}]
                         },
+                        {
+                            name: 'is_new_rejecting',
+                            type: 'select',
+                            tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的状态'],
+                            placeholder: '退件状态',
+                            data: [{name: '无', value: '无'}, {name: '有', value: '有'},{name: '已处理', value: '已处理'}]
+                        },
                     ]
                 ];
                 _this.form = new query({
@@ -382,6 +403,7 @@
                     {name: 'received_at', value: '收货日期'},
                     {name: 'weighed_at', value: '称重日期'},
                     {name: 'transfer_status', value: '快递路由'},
+                    {name: 'is_new_rejecting', value: '退件状态'},
                     {name: 'remark', value: '客服备注'},
                     {name: 'result_explain', value: '情况说明'},
                     {name: 'issue_type', value: '问题类别'},