1

app/Service/SalesOrderService.php

@@ -768,10 +768,12 @@ class SalesOrderService extends Service
         if(! empty($data['order_list'])){
             if($data['order_list'] == 1){
                 //订单合同 安装件合同 状态未指派总社分社的 或者 快递件合同
-                $model->where('state', '<=', SalesOrder::State_three);
+                $model->where('dispatch_time_second', 0);
+//                $model->where('state', '<=', SalesOrder::State_three);
             }elseif($data['order_list'] == 2){
                 //派单合同 安装件合同 状态已指派总社分社的
-                $model->where('state', '>=', SalesOrder::State_four);
+                $model->where('dispatch_time_second', '>', 0);
+//                $model->where('state', '>=', SalesOrder::State_four);
             }
         }
         if(isset($data['state'])) $model->where('state',$data['state']);