diff --git a/admin/controllers/items/Transfer.php b/admin/controllers/items/Transfer.php
index 2f00defa..7a13661f 100644
--- a/admin/controllers/items/Transfer.php
+++ b/admin/controllers/items/Transfer.php
@@ -52,7 +52,7 @@ class Transfer extends HD_Controller
$this->data['statusAry'] = $this->mdTransfer->statusAry();
$this->data['abnormalAry'] = $this->mdTransfer->abnormalAry();
$this->data['autoList'] = $autoList;
- $this->data['showInfo'] = ['uidTypeAry' => $this->mdTransfer->uidTypeAry(), 'takeCar' => $re['takeCar']];
+ $this->data['showInfo'] = ['uidTypeAry' => $this->mdTransfer->uidTypeAry(), 'takeCar' => $re['takeCar'], 'trailerFeesAry' => [1 => '有', 2 => '无']];
$this->data['pager'] = array('count' => ceil($total / $params['size']), 'curr' => $params['page'], 'totle' => $total);
$this->data['_title'] = '车辆调拨';
$this->show_view('items/transfer/lists', true);
@@ -72,6 +72,15 @@ class Transfer extends HD_Controller
} else {
$params['abnormal'] = '';
}
+ if ($params['trailer_fees']) {
+ if ($params['trailer_fees'] == 1) {
+ $where['trailer_fees >'] = 0;
+ } else {
+ $where['trailer_fees'] = 0;
+ }
+ } else {
+ $params['trailer_fees'] = '';
+ }
!$params['out_city_id'] && $params['out_city_id'] = '';
!$params['out_county_id'] && $params['out_county_id'] = '';
!$params['out_admin_id'] && $params['out_admin_id'] = '';
@@ -168,7 +177,7 @@ class Transfer extends HD_Controller
foreach ($rows as $v) {
$jsondata = $v['jsondata'] ? json_decode($v['jsondata'], true) : [];
$item_info = $this->item_info($v['item_id'], 1);
- $out_uid_title = $in_uid_title = '-';
+ $out_uid_title = $in_uid_title = $transport_name = '-';
$tag = $params['size'] == 10000 ? '/' : '
';
$out_addr_name = $in_addr_name = '';
if ($v['out_uid']) {
@@ -192,13 +201,15 @@ class Transfer extends HD_Controller
}
$in_addr_name = $this->take_biz(['uid' => $v['in_uid'], 'biz_id' => $v['biz_id'], 'addr_id' => $v['addr_id']], $v['in_type']);
}
+ $jsondata['transport']['name'] && $transport_name = $jsondata['transport']['name'];
$setValue = [
'id' => $v['id'],
'title' => $item_info['title'],
'vin' => $item_info['vin'],
'out_uid_title' => $out_uid_title,
'in_uid_title' => $in_uid_title,
- 'transport_name' => $jsondata['transport']['name'],
+ 'transport_name' => $transport_name,
+ 'trailer_fees' => $v['trailer_fees'],
'abnormal' => $this->mdTransfer->abnormalAry($v['abnormal']),
'c_time' => date('Y.m.d H:i', $v['c_time']),
'status' => $v['status'],
@@ -217,7 +228,6 @@ class Transfer extends HD_Controller
$re_biz = $this->mdBiz->get(array('id' => $v['fees_biz_id']));
$trailer_fees .= '-' . $re_biz['biz_name'];
}
- $setValue['trailer_fees'] = $v['trailer_fees'];
$setValue['fees'] = $trailer_fees;
$setValue['reason'] = $jsondata['reason'] ? $jsondata['reason'] : '';
}
diff --git a/admin/controllers/receiver/Customer.php b/admin/controllers/receiver/Customer.php
index 51b5514a..388d5ab1 100644
--- a/admin/controllers/receiver/Customer.php
+++ b/admin/controllers/receiver/Customer.php
@@ -48,7 +48,6 @@ class Customer extends HD_Controller
!$params['level'] && $params['level'] = '';
!$params['of_id'] && $params['of_id'] = '';
!$params['of2_id'] && $params['of2_id'] = '';
- !$params['brand_id'] && $params['brand_id'] = '';
$page = $params['page'] = $params['page'] ? intval($params['page']) : 1;
$size = $params['size'] = $params['size'] ? intval($params['size']) : 20;
@@ -75,8 +74,6 @@ class Customer extends HD_Controller
}
!$params['search_tp'] && $params['search_tp'] = 'mobile';
strlen($params['status']) && $where["status"] = $params['status'];
- $params['cf_title'] && $where['cf_title'] = $params['cf_title'];
- $params['brand_id'] && $where['brand_id'] = $params['brand_id'];
if ($params['qdjl_id']) {
$where["biz_id in(select biz_id from lc_app_licheb_channel_biz where uid={$params['qdjl_id']})"] = null;
}
@@ -207,8 +204,8 @@ class Customer extends HD_Controller
'mobile' => $val['mobile'],
'mobile_sub' => $mobile_sub,
'level' => $val['level'],
- 'cf_title' => $val['cf_title'],
'of_title' => $of_title,
+ 'of2_id' => $val['of2_id'],
'status_name' => $status_arr[$val['status']],
'admin_name' => isset($admin_rows[$val['admin_id']]) ? $admin_rows[$val['admin_id']][0]['uname'] : '',
'biz_name' => isset($biz_rows[$val['biz_id']]) ? $biz_rows[$val['biz_id']][0]['biz_name'] : '',
@@ -219,8 +216,6 @@ class Customer extends HD_Controller
//渠道经理
$qdjl_lists = $this->app_licheb_users_model->select(array('group_id' => 4, 'status' => 1, 'biz_id<>' => '0'), 'id desc', 0, 0, 'id,uname as name');
$show_info['levelAry'] = $this->customers_model->get_sdata('level');
- $show_info['cfTitleAry'] = $this->customers_model->get_sdata('cfrom');
- $show_info['brandAry'] = $this->auto_brand_model->select(['status' => 1], 'id desc', '', '', 'id,name');
$show_info['offlineSourcesAry'] = $offlineSources;
$this->data['show_info'] = $show_info;
$this->data['lists'] = $lists;
diff --git a/admin/views/items/transfer/lists.php b/admin/views/items/transfer/lists.php
index d8f252cf..8900cecf 100644
--- a/admin/views/items/transfer/lists.php
+++ b/admin/views/items/transfer/lists.php
@@ -26,6 +26,15 @@
+