From c06f3b52417865e9f2c4567f663c65efca075975 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 20 Jun 2022 17:23:51 +0800
Subject: [PATCH] edit-admin-filter_order

---
 admin/libraries/Ordersv2List.php       | 11 +++++++++--
 admin/views/receiver/orderv2/lists.php | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index d897212b..563ec780 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -42,6 +42,7 @@ class Ordersv2List
         !strlen($params['payway']) && $params['payway'] = '';
         !$params['biz_type'] && $params['biz_type'] = '';
         !strlen($params['over_id']) && $params['over_id'] = '';
+        !strlen($params['is_bill']) && $params['is_bill'] = '';
         $fieldAry = $this->get_fields($status_pid);
         $show_info['offlineSourcesAry'] = $this->ci->mdCustomers->offlineSources();//客户来源
         $show_info['paywayAry'] = $this->paywayAry;//付款方式
@@ -135,6 +136,13 @@ class Ordersv2List
                 $where["{$this->t1}.bill_time <="] = $bill_time[1] . ' 23:59:59';
             }
         }
+        if(strlen($params['is_bill'])){
+            if($params['is_bill']){
+                $where["{$this->t1}.bill_time <> '0000-00-00 00:00:00'"] = null;
+            }else{
+                $where["{$this->t1}.bill_time"] = '0000-00-00 00:00:00';
+            }
+        }
         //交付时长
         if(strlen($params['over_id'])){
             if($params['over_id']==3){
@@ -220,10 +228,9 @@ class Ordersv2List
         if ($params['status_pid'] == 4) { //交付需要开票后才显示
             $where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null;
         }
-        if (strlen($params['status_pid']) && $params['status_pid'] && $params['status_pid']!=21) {
+        if (strlen($params['status_pid']) && $params['status_pid'] && !in_array($params['status_pid'],[21,5,3])) {
             $where["{$this->t1}.id>="] = Orders_v2_entity::V2_START_ID;
         }
-
         if (strlen($params['status_pid']) && !$params['status_pid']) { //付款列表 下定时间排序
             $orderby = "{$this->t1}.order_time desc";
         } elseif ($params['status_pid'] == 3) { // 开票列表 开票时间排序
diff --git a/admin/views/receiver/orderv2/lists.php b/admin/views/receiver/orderv2/lists.php
index 90e97a00..213fe571 100644
--- a/admin/views/receiver/orderv2/lists.php
+++ b/admin/views/receiver/orderv2/lists.php
@@ -119,6 +119,16 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">是否开票：</label>
+                <div class="am-para-inline w100">
+                    <select name="is_bill" v-model="params.is_bill">
+                        <option value="">请选择</option>
+                        <option value="0">否</option>
+                        <option value="1">是</option>
+                    </select>
+                </div>
+            </div>
             <div class="am-form-group" style="margin-bottom: 0px;"></div>
             <div class="am-form-group fl">
                 <label class="am-para-label w100">车型：</label>