diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index e13ed61b..d4e29c62 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -77,13 +77,8 @@ class Orders extends HD_Controller $this->load->library('OrdersList'); $params['list_type'] = 'all'; $result = $this->orderslist->lists($params['status_pid'], $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['qdjl_lists'] = $result['qdjl_lists']; + $this->data = $result; $this->data['status_arr'] = $status_arr; - $this->data['_title'] = '全部订单列表'; return $this->show_view($result['view'], true); } @@ -341,7 +336,7 @@ class Orders extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($params['status_pid'], $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Agent.php b/admin/controllers/receiver/order/Agent.php index 8a6c6e07..39bbaa47 100644 --- a/admin/controllers/receiver/order/Agent.php +++ b/admin/controllers/receiver/order/Agent.php @@ -1,6 +1,11 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['_title'] = $result['title'].'列表'; - return $this->show_view('receiver/order/agent/lists', true); + $this->data = $result; + return $this->show_view($result['view'], true); } public function get(){ @@ -55,7 +55,7 @@ class Agent extends HD_Controller{ $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Bill.php b/admin/controllers/receiver/order/Bill.php index 84589d44..8c82feff 100644 --- a/admin/controllers/receiver/order/Bill.php +++ b/admin/controllers/receiver/order/Bill.php @@ -1,6 +1,11 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['_title'] = $result['title'].'列表'; + $this->data = $result; return $this->show_view($result['view'], true); } @@ -62,7 +62,7 @@ class Bill extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Ckcar.php b/admin/controllers/receiver/order/Ckcar.php index e5ff9f89..c21ea120 100644 --- a/admin/controllers/receiver/order/Ckcar.php +++ b/admin/controllers/receiver/order/Ckcar.php @@ -1,6 +1,11 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['_title'] = $result['title'] . '列表'; + $this->data = $result; return $this->show_view($result['view'], true); } @@ -63,7 +63,7 @@ class Ckcar extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Delivery.php b/admin/controllers/receiver/order/Delivery.php index afcc7a55..989dec27 100644 --- a/admin/controllers/receiver/order/Delivery.php +++ b/admin/controllers/receiver/order/Delivery.php @@ -1,6 +1,11 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['_title'] = $result['title'].'列表'; + $this->data = $result; return $this->show_view($result['view'], true); } @@ -63,7 +63,7 @@ class Delivery extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Loan.php b/admin/controllers/receiver/order/Loan.php index 1ed5958a..07efc072 100644 --- a/admin/controllers/receiver/order/Loan.php +++ b/admin/controllers/receiver/order/Loan.php @@ -1,6 +1,11 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['_title'] = $result['title'] . '列表'; + $this->data = $result; return $this->show_view($result['view'], true); } @@ -63,7 +63,7 @@ class Loan extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php index b1c7b4f7..d9052cb8 100644 --- a/admin/controllers/receiver/order/Sign.php +++ b/admin/controllers/receiver/order/Sign.php @@ -1,9 +1,15 @@ input->get(); $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $this->data['pager'] = $result['pager']; - $this->data['lists'] = $result['lists']; - $this->data['params'] = $result['params']; - $this->data['searchTpAry'] = $result['searchTpAry']; - $this->data['status_arr'] = $result['status_arr']; - $this->data['qdjl_lists'] = $result['qdjl_lists']; - $this->data['_title'] = $result['title'] . '列表'; + $this->data = $result; return $this->show_view($result['view'], true); } @@ -63,7 +63,7 @@ class Sign extends HD_Controller $params['size'] = 10000; $this->load->library('OrdersList'); $result = $this->orderslist->lists($this->status_pid, $params); - $fileName = $result['title']; + $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { $temp['name'] = $value['name']; $temp['mobile'] = $value['mobile']; diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php index 3b906c31..bd790848 100644 --- a/admin/libraries/OrdersList.php +++ b/admin/libraries/OrdersList.php @@ -8,6 +8,7 @@ class OrdersList private $ci; private $searchTpAry = array('mobile' => '客户手机号', 'name' => '客户姓名', 'sid' => '订单号'); + private $paywayAry = array(0 => '贷款', 1 => '全款'); public function __construct() { @@ -23,12 +24,13 @@ class OrdersList public function lists($status_pid, $params = array()) { $result = array(); - //渠道经理 !$params['qdjl_id'] && $params['qdjl_id'] = ''; + //渠道经理 $qdjl_lists = $this->ci->mdLichebUsers->select(array('group_id' => 4, 'status' => 1, 'biz_id<>' => '0'), 'id desc', 0, 0, 'id,uname as name'); if (!strlen($status_pid)) { $result = $this->orders($params); $result['qdjl_lists'] = $qdjl_lists; + $result['paywayAry'] = $this->paywayAry; return $result; } if ($status_pid == 0) { @@ -51,6 +53,7 @@ class OrdersList $result = $this->delivery($status_pid, $params); } $result['qdjl_lists'] = $qdjl_lists; + $result['paywayAry'] = $this->paywayAry; return $result; } @@ -67,6 +70,9 @@ class OrdersList $size = $params['size'] = $params['size'] ? intval($params['size']) : 20; $status_arr = $this->ci->mdOrders->statusAry(); $where = ["status>=" => 0]; + if (strlen($params['payway'])) { + $where["payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -154,8 +160,12 @@ class OrdersList $count = $this->ci->mdOrders->count($where); $lists = []; if ($count) { - $fileds = "id,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time"; + $fileds = "id,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time,biz_id"; $rows = $this->ci->mdOrders->select($where, "id desc", $page, $size, $fileds); + //门店 + $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); + !$str_biz_ids && $str_biz_ids = 0; + $bizs = $this->ci->biz_model->map('id', 'biz_name', array("id in({$str_biz_ids})" => null)); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); $brands = $this->ci->auto_brand_model->get_map_by_ids($brand_arr, 'id,name'); @@ -176,15 +186,18 @@ class OrdersList $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; $val['price'] = number_format($val['price'], 2); $val['deposit'] = number_format($val['deposit'], 2); - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]['name']; + $val['biz_name'] = $bizs[$val['biz_id']]; + $val['c_time'] = date('Y-m-d H:i:s', $val['c_time']); $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? '全部订单' : '全部订单列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/orders/lists', 'title' => '全部订单'); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/orders/lists', '_title' => $_title); } /** @@ -204,6 +217,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -348,25 +364,26 @@ class OrdersList } foreach ($rows as $key => $val) { $admin = $map_admin[$val['admin_id']]; - $admin_name = $admin ? "{$map_biz[$admin['biz_id']]} {$admin['uname']}" : ''; $brand_name = isset($brands[$val['brand_id']]) ? $brands[$val['brand_id']][0]['name'] : ''; $series_name = isset($series[$val['s_id']]) ? $series[$val['s_id']][0]['name'] : ''; $v_name = isset($attr[$val['v_id']]) ? $attr[$val['v_id']][0]['title'] : ''; $cor_name = isset($attr[$val['cor_id']]) ? $attr[$val['cor_id']][0]['title'] : ''; $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['c_time'] = date('Y-m-d H:i:s', $val['c_time']); $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; - $val['admin_name'] = $admin_name; + $val['admin_name'] = $admin ? $admin['uname'] : ''; $val['price'] = $val['price'] > 1 ? number_format($val['price']) : number_format($val['price'], 2); $val['deposit'] = $val['deposit'] > 1 ? number_format($val['deposit']) : number_format($val['deposit'], 2); + $val['biz_name'] = $map_biz[$admin['biz_id']]; $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/sign/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/sign/lists', '_title' => $_title); } /** @@ -386,6 +403,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -495,8 +515,9 @@ class OrdersList } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/loan/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/loan/lists', '_title' => $_title); } /** @@ -516,6 +537,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -615,8 +639,11 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; + $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; $rows = $this->ci->order_ckcars_model->select_order($where, "$t1.id desc", $page, $size, $fileds); + $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); + !$str_biz_ids && $str_biz_ids = 0; + $bizs = $this->ci->biz_model->map('id', 'biz_name', array("id in({$str_biz_ids})" => null)); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); $brands = $this->ci->auto_brand_model->get_map_by_ids($brand_arr, 'id,name'); @@ -637,15 +664,17 @@ class OrdersList $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; $val['price'] = number_format($val['price'], 2); $val['deposit'] = number_format($val['deposit'], 2); - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; + $val['biz_name'] = $bizs[$val['biz_id']]; $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/ckcar/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/ckcar/lists', '_title' => $_title); } /** @@ -665,6 +694,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -764,8 +796,12 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; + $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; $rows = $this->ci->order_bills_model->select_order($where, "$t1.id desc", $page, $size, $fileds); + //门店 + $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); + !$str_biz_ids && $str_biz_ids = 0; + $bizs = $this->ci->biz_model->map('id', 'biz_name', array("id in({$str_biz_ids})" => null)); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); $brands = $this->ci->auto_brand_model->get_map_by_ids($brand_arr, 'id,name'); @@ -786,15 +822,17 @@ class OrdersList $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; $val['price'] = number_format($val['price'], 2); $val['deposit'] = number_format($val['deposit'], 2); - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; + $val['biz_name'] = $bizs[$val['biz_id']]; $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/bill/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/bill/lists', '_title' => $_title); } /** @@ -814,6 +852,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -913,8 +954,12 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; + $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; $rows = $this->ci->order_agents_model->select_order($where, "$t1.id desc", $page, $size, $fileds); + //门店 + $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); + !$str_biz_ids && $str_biz_ids = 0; + $bizs = $this->ci->biz_model->map('id', 'biz_name', array("id in({$str_biz_ids})" => null)); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); $brands = $this->ci->auto_brand_model->get_map_by_ids($brand_arr, 'id,name'); @@ -935,15 +980,17 @@ class OrdersList $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; $val['price'] = number_format($val['price'], 2); $val['deposit'] = number_format($val['deposit'], 2); - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; + $val['biz_name'] = $bizs[$val['biz_id']]; $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/agent/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/agent/lists', '_title' => $_title); } /** @@ -963,6 +1010,9 @@ class OrdersList $where = [ "$t2.status>=" => 0, ]; + if (strlen($params['payway'])) { + $where["{$t2}.payway"] = $params['payway']; + } if ($params['qdjl_id']) {//渠道经理 $re_bu = $this->ci->mdLichebUsers->get(array('id' => $params['qdjl_id'])); if ($re_bu['biz_id']) { @@ -1062,8 +1112,12 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; + $fileds .= "$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time"; $rows = $this->ci->order_deliverys_model->select_order($where, "$t1.id desc", $page, $size, $fileds); + //门店 + $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); + !$str_biz_ids && $str_biz_ids = 0; + $bizs = $this->ci->biz_model->map('id', 'biz_name', array("id in({$str_biz_ids})" => null)); //品牌车型 $brand_arr = array_unique(array_column($rows, 'brand_id')); $brands = $this->ci->auto_brand_model->get_map_by_ids($brand_arr, 'id,name'); @@ -1084,15 +1138,17 @@ class OrdersList $val['car_name'] = "{$brand_name}-{$series_name}-{$v_name}-{$cor_name}"; $val['price'] = number_format($val['price'], 2); $val['deposit'] = number_format($val['deposit'], 2); - $val['payway_name'] = $val['payway'] ? '全款' : '贷款'; + $val['payway_name'] = $this->paywayAry[$val['payway']]; $val['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : ''; $val['status_name'] = $status_arr[$val['status']]; + $val['biz_name'] = $bizs[$val['biz_id']]; $lists[] = $val; } } $pager = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); + $_title = $size > 1000 ? $statusAry['name'] : $statusAry['name'] . '列表'; return array('lists' => $lists, 'pager' => $pager, 'params' => $params, 'status_arr' => $status_arr - , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/delivery/lists', 'title' => $statusAry['name']); + , 'searchTpAry' => $this->searchTpAry, 'view' => 'receiver/order/delivery/lists', '_title' => $_title); } diff --git a/admin/views/receiver/order/agent/lists.php b/admin/views/receiver/order/agent/lists.php index 3b918967..549309c5 100644 --- a/admin/views/receiver/order/agent/lists.php +++ b/admin/views/receiver/order/agent/lists.php @@ -94,7 +94,7 @@
-
+
+
+ +
+ +
+
@@ -188,10 +200,11 @@ 客户姓名 客户电话 车辆 - 车辆平台价 - 定金 - 付款方式 - 状态 + 门店 + 车辆平台价 + 定金 + 付款方式 + 状态 操作 @@ -202,6 +215,7 @@ + diff --git a/admin/views/receiver/order/bill/lists.php b/admin/views/receiver/order/bill/lists.php index 908959f0..d45d58a7 100644 --- a/admin/views/receiver/order/bill/lists.php +++ b/admin/views/receiver/order/bill/lists.php @@ -94,7 +94,7 @@
-
+
+
+ +
+ +
+
@@ -188,10 +200,11 @@ 客户姓名 客户电话 车辆 - 车辆平台价 - 定金 - 付款方式 - 状态 + 门店 + 车辆平台价 + 定金 + 付款方式 + 状态 操作 @@ -202,6 +215,7 @@ + diff --git a/admin/views/receiver/order/ckcar/lists.php b/admin/views/receiver/order/ckcar/lists.php index f6ee1ff5..7ae8d02e 100644 --- a/admin/views/receiver/order/ckcar/lists.php +++ b/admin/views/receiver/order/ckcar/lists.php @@ -107,7 +107,7 @@
-
+
+
+ +
+ +
+
@@ -201,10 +213,11 @@ 客户姓名 客户电话 车辆 - 车辆平台价 - 定金 - 付款方式 - 状态 + 门店 + 车辆平台价 + 定金 + 付款方式 + 状态 操作 @@ -215,6 +228,7 @@ + diff --git a/admin/views/receiver/order/delivery/lists.php b/admin/views/receiver/order/delivery/lists.php index 2e0112c6..2d4957b6 100644 --- a/admin/views/receiver/order/delivery/lists.php +++ b/admin/views/receiver/order/delivery/lists.php @@ -107,7 +107,7 @@
-
+
+
+ +
+ +
+
@@ -201,10 +213,11 @@ 客户姓名 客户电话 车辆 - 车辆平台价 - 定金 - 付款方式 - 状态 + 门店 + 车辆平台价 + 定金 + 付款方式 + 状态 操作 @@ -215,6 +228,7 @@ + diff --git a/admin/views/receiver/order/loan/lists.php b/admin/views/receiver/order/loan/lists.php index d5c6665c..42a1d53e 100644 --- a/admin/views/receiver/order/loan/lists.php +++ b/admin/views/receiver/order/loan/lists.php @@ -107,7 +107,7 @@
-
+
+
+ +
+ +
+
diff --git a/admin/views/receiver/order/sign/lists.php b/admin/views/receiver/order/sign/lists.php index 2c5e9c78..85012497 100644 --- a/admin/views/receiver/order/sign/lists.php +++ b/admin/views/receiver/order/sign/lists.php @@ -107,7 +107,7 @@
-
+
+
+ +
+ +
+
@@ -201,11 +213,12 @@ 客户姓名 客户电话 车辆 - 合同价 - 定金 + 门店 + 合同价 + 定金 付款 合同状态 - 销售员 + 销售员 订单时间 操作 @@ -217,6 +230,7 @@ + @@ -298,9 +312,9 @@ } var href = $.menu.parseUri(window.location.href); - href = href.replace("orders?", "order/sign/export?") + ""; + href = href.replace("orders?", "order/sign/export?") + ""; - href = href.replace("sign?", "sign/export?"); + href = href.replace("sign?", "sign/export?"); window.location.href = href; }, diff --git a/admin/views/receiver/orders/lists.php b/admin/views/receiver/orders/lists.php index 466d1800..5d0da349 100644 --- a/admin/views/receiver/orders/lists.php +++ b/admin/views/receiver/orders/lists.php @@ -86,7 +86,7 @@
-
+
+
+ +
+ +
+
@@ -179,11 +191,13 @@ 客户姓名 客户电话 - 车辆 - 车辆平台价 - 定金 - 付款方式 - 状态 + 车辆 + 门店 + 车辆平台价 + 定金 + 付款方式 + 状态 + 订单时间 操作 @@ -194,10 +208,12 @@ + + 详情