title

application/index/controller/OfficePayLog.php

@@ -2581,7 +2581,7 @@ class OfficePayLog extends Basic
      */
     public function intentionsWarning()
     {
-        if (!$this->request->isAjax()) {
+        if (!$this->request->isAjax() && empty($this->params['excel'])) {
             return view('payLog/intentions_warning');
         }
 
@@ -2634,9 +2634,16 @@ class OfficePayLog extends Basic
         try {
             $order = new OfficeOPayLogModel();
             $field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,c.name,a.real_money';
+            if (empty($this->params['excel'])) {
                 $list = $order->getPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
                 $data['total'] = $order->getPayLogOrderListLimitTotal($where);
                 $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) {
             $msg = '内部错误：' . $e->getMessage();
         }

application/index/controller/PayLog.php

@@ -96,7 +96,7 @@ class PayLog extends Basic
                 $list = $order->getPayLogOrderListLimit(1, 40000, $order_ = 'a.id desc', $field, $where);
                 $export = new ExportExcelUntil();
                 $title = ['提交时间', '收款ID', '带看ID','成交报告ID', '入账日期', '提交人', '收款金额（元）'];
-                return $export->exportTable('收款记录', $list, 6, '收款记录', $title);
+                return $export->exportTable('收款记录-商铺', $list, 6, '收款记录-商铺', $title);
             }
 
         } catch (\Exception $e) {