diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 686627fe2..69d4d26f0 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1562,4 +1562,31 @@ function db2csv(&$data,$title,$header=false){ unlink($filename); die(); } +//导出csv 新增字段排序功能 +function data2csv(&$data,$title,$fields){ + set_time_limit(0); + $filename = $title .'.csv'; + $fp = fopen($filename, 'w'); //生成临时文件 + fwrite($fp, chr(0xEF).chr(0xBB).chr(0xBF));//转码,防止乱码 + + $field = array_keys($fields); + $header = array_values($fields); + fputcsv($fp, $header); + foreach ($data as $row) { + $a = []; + foreach($field as $k=>$v){ + $a[$v] = $row[$v]; + } + fputcsv($fp, $a); + } + fclose($fp); //每生成一个文件关闭 + //下载 + header('Content-Type: application/vnd.ms-excel;charset=utf-8'); + header('Content-Disposition: attachment;filename="' . $title . '.csv"'); + header('Cache-Control: max-age=0'); + header('Content-Length: ' . filesize($filename)); + readfile($filename); + unlink($filename); + die(); +} ?> diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index e938aa1ae..151e6c917 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -254,7 +254,7 @@ class FinancePromoteController extends AdminController $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, - IFNULL(company_id,0) company_id,company_name,promote_id"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account"; return M() ->table("tab_spend s") ->field($field) diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index eb4e51695..540a251a6 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -248,7 +248,7 @@
导出 + href="{:U('FinancePromote/index',array_merge(['export'=>1],I('get.')))}">导出 {$_page|default=''}
diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html index e67244370..3896815ea 100644 --- a/Application/Admin/View/FinancePromote/promoteUser.html +++ b/Application/Admin/View/FinancePromote/promoteUser.html @@ -199,8 +199,8 @@ {$data.company_name} - {:get_promote_name($data['promote_id'])} - + {$data['promote_account']} + {$data.cash_count} {$data.balance_coin_count} {$data.bind_coin_count}