diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index a9b4f000..2a810a51 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -364,6 +364,10 @@ class Ordersv2List
$fields['price_car'] = number_format($this->ci->orders_v2_entity->total_price($val['id'],$val['money_json']),2);
$fields['payway_name'] = $this->paywayAry[$val['payway']];
$fields['price'] = $fields['payway_name']."
".$fields['price_car'];
+ $fields['brand_name'] = $brand_name;
+ $fields['series_name'] = $series_name;
+ $fields['v_name'] = $v_name;
+ $fields['cor_name'] = $cor_name;
$fields['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : '';
if($val['status']==2 || $val['id']<= Orders_v2_entity::V2_START_ID){
@@ -375,6 +379,7 @@ class Ordersv2List
}
$fields['status_name'] = $status_name;
$fields['biz_name'] = $bizs[$val['biz_id']] ? $bizs[$val['biz_id']]['biz_name'].'
'.$admins[$val['admin_id']] : '';
+ $size > 1000 && $fields['biz_name'] = $bizs[$val['biz_id']] ? $bizs[$val['biz_id']]['biz_name'] : '';
$fields['city_name'] = $bizs[$val['biz_id']] ? $bizs[$val['biz_id']]['city_name'] : '';
$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']);
@@ -588,6 +593,16 @@ class Ordersv2List
if ($export) {
$fields1['name'] = ['title' => '客户姓名'];
$fields1['mobile'] = ['title' => '客户电话'];
+ $fields1['id_card'] = ['title' => '证件号码'];
+ $fields1['brand_name'] = ['title' => '品牌'];
+ $fields1['series_name'] = ['title' => '车系'];
+ $fields1['v_name'] = ['title' => '车型'];
+ $fields1['cor_name'] = ['title' => '车身颜色'];
+ $fields1['vin'] = ['title' => 'vin码'];
+ $fields1['city_name'] = ['title'=>'城市'];
+ $fields1['biz_type'] = ['title'=>'门店类型'];
+ $fields1['biz_name'] = ['title' => '门店'];
+ $fields1['admin_name'] = ['title' => '销售人员'];
} else {
$fields1['name'] = ['title' => '客户', 'width' => '14%'];
}
@@ -627,20 +642,16 @@ class Ordersv2List
}
$fields = array_merge($fields1, $fields2);
if ($export) {
- unset($fields['price'],$fields['c_time']);
+ unset($fields['price'],$fields['c_time'],$fields['car_name'],$fields['vin']);
$fields['payway_name'] = ['title'=>'付款方式'];
$fields['pro_loan'] = ['title'=>'金融机构'];
$fields['price_loan'] = ['title'=>'贷款金额'];
$fields['is_sure'] = ['title'=>'确认到款(是/否)'];
$fields['price_car'] = ['title'=>'最终售价'];
- $fields['city_name'] = ['title'=>'城市'];
- $fields['biz_type'] = ['title'=>'门店类型'];
- $fields['vin'] = ['title' => 'vin码'];
- $fields['over_time'] = ['title' => '止交付时间'];
- $fields['order_time'] = ['title' => '下定时间'];
- $fields['bill_time'] = ['title' => '开票时间'];
- $fields['id_card'] = ['title' => '身份证'];
- $fields['admin_name'] = ['title' => '销售人员'];
+ !$fields['c_time'] && $fields['c_time'] = ['title' => '订单时间'];
+ !$fields['over_time'] && $fields['over_time'] = ['title' => '止交付时间'];
+ !$fields['order_time'] && $fields['order_time'] = ['title' => '下定时间'];
+ !$fields['bill_time'] && $fields['bill_time'] = ['title' => '开票时间'];
$fields['address'] = ['title' => '联系人地址'];
}
return $fields;
diff --git a/admin/views/receiver/orderv2/lists.php b/admin/views/receiver/orderv2/lists.php
index f9d59d5a..acf5ce75 100644
--- a/admin/views/receiver/orderv2/lists.php
+++ b/admin/views/receiver/orderv2/lists.php
@@ -221,7 +221,7 @@