订单问题件-查询

添加二次快递单号、二次订单号搜索条件

app/Services/OrderIssueService.php

@@ -219,6 +219,18 @@ class OrderIssueService
                 }
             });
         }
+        if(isset($condition['sendOrderClientCode'])){
+            $query->whereHas('secondOrder',function($query)use($condition){
+                $this->searchWay($query,$condition['sendOrderClientCode'],'client_code');
+            });
+            $query->orWhere('second_client_no',$condition['sendOrderClientCode']);
+        }
+        if(isset($condition['sendOrderLogisticNumber'])){
+            $query->whereHas('secondOrder.packages',function($query)use($condition){
+                $this->searchWay($query,$condition['sendOrderLogisticNumber'],'logistic_number');
+            });
+            $query->orWhere('second_logistic_number',$condition['sendOrderLogisticNumber']);
+        }
         return $query;
     }
 

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

@@ -789,6 +789,8 @@
                     {name: 'hiddenTag', type: 'input', tip: '隐藏标识',placeholder: '标识'},
                     {name: 'is_new_rejecting', type: 'select', tip: '退件状态',placeholder: '退件状态',data:[{name:'无',value:'无'},{name:'有',value:'有'},{name:'已处理',value:'已处理'}]},
                     {name: 'rejectingStatus', type: 'select', tip: '退单状态',placeholder: '退单状态',data:this.rejectingStatus},
+                    {name: 'sendOrderClientCode', type: 'input', tip: '二次客户订单号',placeholder: '二次客户订单号'},
+                    {name: 'sendOrderLogisticNumber', type: 'input', tip: '二次运单号',placeholder: '二次运单号'},
                 ]];
                 this.form = new query({
                     el: '#form_div',