diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php index 2a810a51..814025e0 100644 --- a/admin/libraries/Ordersv2List.php +++ b/admin/libraries/Ordersv2List.php @@ -384,14 +384,19 @@ class Ordersv2List $fields['biz_type'] = $bizs[$val['biz_id']] ? $this->ci->biz_model->type_ary($bizs[$val['biz_id']]['type']) : ''; $fields['c_time'] = date('Y-m-d H:i:s', $val['c_time']); $of_title = '-'; + $of_title_1 = $of_title_2 = ''; $of_id = $customers[$val['customer_id']]['of_id']; if ($of_id) { $of_ary = $offlineSources[$of_id]; $of_title = $of_ary['name']; + $of_ary['name'] && $of_title_1 = $of_ary['name']; $of2_id = $customers[$val['customer_id']]['of2_id']; $of2_id && $of_title .= '-' . $of_ary['list'][$of2_id]; + $of2_id && $of_ary['list'][$of2_id] && $of_title_2 = $of_ary['list'][$of2_id]; } $fields['of_title'] = $of_title; + $fields['of_title_1'] = $of_title_1; + $fields['of_title_2'] = $of_title_2; $fields['order_time'] = $val['order_time'] != '0000-00-00 00:00:00' ? $val['order_time'] : ''; $fields['bill_time'] = $val['bill_time'] != '0000-00-00 00:00:00' ? $val['bill_time'] : ''; $fields['over_time'] = $val['over_time'] != '0000-00-00 00:00:00' ? date('Y-m-d',strtotime($val['over_time'])) : ''; @@ -561,14 +566,19 @@ class Ordersv2List $fields['biz_name'] = $bizs[$val['biz_id']]; $fields['c_time'] = date('Y-m-d H:i:s', $val['c_time']); $of_title = '-'; + $of_title_1 = $of_title_2 = ''; $of_id = $customers[$val['customer_id']]['of_id']; if ($of_id) { $of_ary = $offlineSources[$of_id]; $of_title = $of_ary['name']; + $of_ary['name'] && $of_title_1 = $of_ary['name']; $of2_id = $customers[$val['customer_id']]['of2_id']; $of2_id && $of_title .= '-' . $of_ary['list'][$of2_id]; + $of2_id && $of_ary['list'][$of2_id] && $of_title_2 = $of_ary['list'][$of2_id]; } $fields['of_title'] = $of_title; + $fields['of_title_1'] = $of_title_1; + $fields['of_title_2'] = $of_title_2; $lists[] = $fields; } } @@ -603,6 +613,8 @@ class Ordersv2List $fields1['biz_type'] = ['title'=>'门店类型']; $fields1['biz_name'] = ['title' => '门店']; $fields1['admin_name'] = ['title' => '销售人员']; + $fields1['of_title_1'] = ['title' => '来源1']; + $fields1['of_title_2'] = ['title' => '来源2']; } else { $fields1['name'] = ['title' => '客户', 'width' => '14%']; } @@ -642,7 +654,7 @@ class Ordersv2List } $fields = array_merge($fields1, $fields2); if ($export) { - unset($fields['price'],$fields['c_time'],$fields['car_name'],$fields['vin']); + unset($fields['price'],$fields['c_time'],$fields['car_name'],$fields['vin'],$fields['of_title']); $fields['payway_name'] = ['title'=>'付款方式']; $fields['pro_loan'] = ['title'=>'金融机构']; $fields['price_loan'] = ['title'=>'贷款金额'];