|
@@ -1491,7 +1491,7 @@ class Order
|
|
|
Dever::alert('请选择时间');
|
|
|
}
|
|
|
$where['status'] = $status;
|
|
|
- $header = array('邀请码', '姓名', '手机号', '身份证号', '会员角色', '代理商区域', '注册金额', '代理费', '直推业绩', '团队业绩', '申请类型','公司名称','申请时间', '初审时间','初审人','终审时间','终审人','审核状态','分润发放时间','分润发放人','权益发放时间','权益发放人','驳回原因','驳回时间','驳回人','管理员备注','推荐人姓名','推荐人电话','推荐人等级','推荐人代理地区');
|
|
|
+ $header = array('邀请码', '姓名', '手机号', '身份证号', '会员角色', '代理商区域', '注册金额', '代理费', '直推业绩', '团队业绩', '申请类型','公司名称','申请时间', '初审时间','初审人','终审时间','终审人','审核状态','分润发放时间','分润发放人','权益发放时间','权益发放人','管理员备注','推荐人姓名','推荐人电话','推荐人等级','推荐人代理地区');
|
|
|
|
|
|
$data = Dever::db('agent/order')->getExcelAll($where);
|
|
|
|
|
@@ -1577,24 +1577,29 @@ class Order
|
|
|
if($process){
|
|
|
foreach($process as $key => $val){
|
|
|
$log = Dever::load('manage/api')->getLog($val['id'], 'agent', 'order_process', 1);
|
|
|
- if($log && $log['admin']){
|
|
|
- if($val['status'] == 1){
|
|
|
- $chushen = date('Y-m-d H:i',$val['cdate']);
|
|
|
+ if($val['status'] == 1){
|
|
|
+ $chushen = date('Y-m-d H:i',$val['cdate']);
|
|
|
+ if($log && $log['admin']){
|
|
|
$admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
$chu = $admin['username'];
|
|
|
- }elseif($val['status'] == 2){
|
|
|
- $zhongshen = date('Y-m-d H:i',$val['cdate']);
|
|
|
+ }
|
|
|
+
|
|
|
+ }elseif($val['status'] == 2){
|
|
|
+ $zhongshen = date('Y-m-d H:i',$val['cdate']);
|
|
|
+ if($log && $log['admin']){
|
|
|
$admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
$zhong = $admin['username'];
|
|
|
}
|
|
|
- if($val['audit'] == 2){
|
|
|
- $audit = '拒绝';
|
|
|
+ }
|
|
|
+ if($val['audit'] == 2){
|
|
|
+ $audit = '拒绝';
|
|
|
+ $bh = $admin['username'];
|
|
|
+ if($log && $log['admin']){
|
|
|
$admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
- $bh = $admin['username'];
|
|
|
+
|
|
|
$audit_cdate = date('Y-m-d H:i',$admin['cdate']);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
$d = array
|
|
@@ -1621,9 +1626,6 @@ class Order
|
|
|
$fr,
|
|
|
$qydate,
|
|
|
$qy,
|
|
|
- $v['audit_desc'],
|
|
|
- $audit_cdate,
|
|
|
- $bh,
|
|
|
$v['admin_desc'],
|
|
|
$parent_name,
|
|
|
$parent_mobile,
|