From a865b9d669cd8453dad4933765b7ad5727aaabd4 Mon Sep 17 00:00:00 2001 From: tping Date: Thu, 28 Jan 2021 10:42:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementLackController.class.php | 4 ++-- .../Controller/CompanyStatementOfflineController.class.php | 4 ++-- Application/Payment/View/ExcelPayment/lists.html | 4 ++-- Application/Payment/View/Payment/lists.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index 2924c9b2e..bc0e1a96e 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -426,8 +426,8 @@ class CompanyStatementLackController extends ThinkController { $mentBtn = [ "pool"=>"发起汇总", - "export"=>"批量导出", - "export_all"=>"导出所有" + "export"=>"导出所选记录", + "export_all"=>"导出当前记录" ]; $resarr = []; foreach ($mentBtn as $k => $v) { diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 96cc877ed..940c312c6 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -367,8 +367,8 @@ class CompanyStatementOfflineController extends ThinkController "setPayment"=>"打款信息确认", "returnSetPayment"=>"打款信息确认撤回", "doPayment"=>"打款确认", - "export"=>"批量导出", - "export_all"=>"导出所有", + "export"=>"导出所选记录", + "export_all"=>"导出当前记录", ]; $resarr = []; foreach ($mentBtn as $k => $v) { diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html index f639eb3e3..642808597 100644 --- a/Application/Payment/View/ExcelPayment/lists.html +++ b/Application/Payment/View/ExcelPayment/lists.html @@ -187,8 +187,8 @@ 打款 Excel导入 - 批量导出 - 导出所有 + 导出所选记录 + 导出当前记录 diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html index d046e6225..62da1af38 100644 --- a/Application/Payment/View/Payment/lists.html +++ b/Application/Payment/View/Payment/lists.html @@ -219,8 +219,8 @@ 打款信息确认 打款信息确认撤回 - 批量导出 - 导出所有 + 导出所选记录 + 导出当前记录 From 6ed8fee113f9caa32fe3b7bb73f8e78f74b4ee86 Mon Sep 17 00:00:00 2001 From: tping Date: Thu, 28 Jan 2021 10:52:03 +0800 Subject: [PATCH 2/2] 1 --- Application/Payment/Controller/PaymentController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 51c7823fd..08f953372 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -93,7 +93,7 @@ class PaymentController extends BaseController } if (isset($_REQUEST['export']) && $_REQUEST['export']==1) { - $map['s.company_type'] = $_REQUEST['export_company_type']; +// $map['s.company_type'] = $_REQUEST['export_company_type']; $data = M("company_statement_info","tab_") ->alias('s') ->field("s.*,p.statement_num statement_pool_num")