Commit 702f372b authored by hujun's avatar hujun

导出意向金预警

parent 5299f449
...@@ -30,7 +30,7 @@ class PayLog extends Basic ...@@ -30,7 +30,7 @@ class PayLog extends Basic
*/ */
public function intentionsWarning() public function intentionsWarning()
{ {
if (!$this->request->isAjax()) { if (!$this->request->isAjax() && empty($this->params['excel'])) {
return view('intentions_warning'); return view('intentions_warning');
} }
...@@ -87,9 +87,18 @@ class PayLog extends Basic ...@@ -87,9 +87,18 @@ class PayLog extends Basic
try { try {
$order = new OPayLogModel(); $order = new OPayLogModel();
$field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,e.name,a.money as real_money'; $field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,e.name,a.money as real_money';
if (empty($this->params['excel'])) {
$list = $order->getPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $list = $order->getPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['total'] = $order->getPayLogOrderListLimitTotal($where); $data['total'] = $order->getPayLogOrderListLimitTotal($where);
$data['list'] = $list; $data['list'] = $list;
} else {
$list = $order->getPayLogOrderListLimit(1, 40000, $order_ = 'a.id desc', $field, $where);
$export = new ExportExcelUntil();
$title = ['提交时间', '收款ID', '带看ID','成交报告ID', '入账日期', '提交人', '收款金额(元)'];
return $export->exportTable('收款记录', $list, 6, '收款记录', $title);
}
} catch (\Exception $e) { } catch (\Exception $e) {
$msg = '内部错误:' . $e->getMessage(); $msg = '内部错误:' . $e->getMessage();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment