From e98d3b1842ece6f88df250b962f66a70ab8cb6a9 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Mon, 1 Nov 2021 10:32:11 +0800
Subject: [PATCH] admin_order_1101

---
 admin/libraries/OrdersList.php        | 29 ++++++++++++++++++++++++++
 admin/views/receiver/order/lists.php  | 28 +++++++++++++++++--------
 admin/views/receiver/orders/lists.php | 30 ++++++++++++++++++---------
 3 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php
index 5ed3cbc9..688c0899 100644
--- a/admin/libraries/OrdersList.php
+++ b/admin/libraries/OrdersList.php
@@ -29,10 +29,12 @@ class OrdersList
         !$params['cf_title'] && $params['cf_title'] = '';
         !$params['cf_clues'] && $params['cf_clues'] = '';
         !$params['payway'] && $params['payway'] = '';
+        !$params['biz_type'] && $params['biz_type'] = '';
         $fieldAry = $this->get_fields($status_pid);
         $show_info['cfTitleAry'] = $this->ci->mdCustomers->get_sdata('cfrom');//来源类型
         $show_info['cfCluesAry'] = $this->ci->mdCustomers->get_sdata('cfrom_clues');//线下来源
         $show_info['paywayAry'] = $this->paywayAry;//付款方式
+        $show_info['bizTypeAry'] =  $this->ci->biz_model->type_ary();//门店类型
         //渠道经理
         $show_info['qdjl_lists'] = $this->ci->mdLichebUsers->select(array('group_id' => 4, 'status' => 1, 'biz_id<>' => '0')
             , 'id desc', 0, 0, 'id,uname as name');
@@ -101,6 +103,9 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["biz_id in ($biz_ids)"] = null;
         }
+        if ($params['biz_type']) {
+            $where['biz_id in (select id from lc_biz where type = ' . $params['biz_type'] . ' and status=1)'] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -283,6 +288,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -502,6 +511,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -676,6 +689,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -868,6 +885,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -1060,6 +1081,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
@@ -1252,6 +1277,10 @@ class OrdersList
             $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["$t2.biz_id in ($biz_ids)"] = null;
         }
+        $biz_type = $params['biz_type'];
+        if ($biz_type) {
+            $where["$t2.biz_id in (select id from lc_biz where type = $biz_type and status=1)"] = null;
+        }
         if ($params['cf_title'] || $params['cf_clues'] || $params['cfrom_id'] || $params['cfrom_id2']) {
             $where_c = 'status>=0';
             if ($params['cfrom_id'] == 24) {
diff --git a/admin/views/receiver/order/lists.php b/admin/views/receiver/order/lists.php
index d4bb6d99..7d49b3fe 100644
--- a/admin/views/receiver/order/lists.php
+++ b/admin/views/receiver/order/lists.php
@@ -151,15 +151,6 @@
                         </select>
                     </div>
                 </div>
-                <div class="am-form-group fl">
-                    <label class="am-para-label w100">渠道经理：</label>
-                    <div class="am-para-inline w100">
-                        <select name="qdjl_id" v-model="params.qdjl_id">
-                            <option value=''>请选择</option>
-                            <option :value="v.id" v-for="(v,i) in show_info.qdjl_lists">{{v.name}}</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>
@@ -188,6 +179,24 @@
                         </select>
                     </div>
                 </div>
+                <div class="am-form-group fl">
+                    <label class="am-para-label w100">渠道经理：</label>
+                    <div class="am-para-inline w100">
+                        <select name="qdjl_id" v-model="params.qdjl_id">
+                            <option value=''>请选择</option>
+                            <option :value="v.id" v-for="(v,i) in show_info.qdjl_lists">{{v.name}}</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="am-form-group fl">
+                    <label class="am-para-label w100">门店类型：</label>
+                    <div class="am-para-inline w100">
+                        <select name="biz_type" v-model="params.biz_type">
+                            <option value="">请选择</option>
+                            <option :value="i" v-for="(v,i) in show_info.bizTypeAry">{{v}}</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>
@@ -397,6 +406,7 @@
                     that.params.brand_id = '';
                     that.params.city_id_admin = '';
                     that.params.qdjl_id = '';
+                    that.params.biz_type = '';
                 }
             },
             watch: {
diff --git a/admin/views/receiver/orders/lists.php b/admin/views/receiver/orders/lists.php
index 66f0962e..7c780fe2 100644
--- a/admin/views/receiver/orders/lists.php
+++ b/admin/views/receiver/orders/lists.php
@@ -132,15 +132,6 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group fl">
-                <label class="am-para-label w100">渠道经理：</label>
-                <div class="am-para-inline w100">
-                    <select name="qdjl_id" v-model="params.qdjl_id">
-                        <option value=''>请选择</option>
-                        <option :value="v.id" v-for="(v,i) in show_info.qdjl_lists">{{v.name}}</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>
@@ -169,6 +160,24 @@
                     </select>
                 </div>
             </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">渠道经理：</label>
+                <div class="am-para-inline w100">
+                    <select name="qdjl_id" v-model="params.qdjl_id">
+                        <option value=''>请选择</option>
+                        <option :value="v.id" v-for="(v,i) in show_info.qdjl_lists">{{v.name}}</option>
+                    </select>
+                </div>
+            </div>
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">门店类型：</label>
+                <div class="am-para-inline w100">
+                    <select name="biz_type" v-model="params.biz_type">
+                        <option value="">请选择</option>
+                        <option :value="i" v-for="(v,i) in show_info.bizTypeAry">{{v}}</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>
@@ -230,7 +239,7 @@
                 <th width="8%"><span>车辆平台价</span></th>
                 <th width="7%"><span>定金</span></th>
                 <th width="6%"><span>付款方式</span></th>
-                <th width="8%"><span>客户来源</span></th>
+                <th width="8%"><span>来源类型</span></th>
                 <th width="8%"><span>状态</span></th>
                 <th width="12%"><span>订单时间</span></th>
             </tr>
@@ -389,6 +398,7 @@
                     that.params.brand_id = '';
                     that.params.city_id_admin = '';
                     that.params.qdjl_id = '';
+                    that.params.biz_type = '';
                 }
             },
             watch: {