Merge pull request 'feature/0128' (#122) from feature/0128 into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/122

Application/Admin/Controller/CompanyStatementLackController.class.php

@@ -426,8 +426,8 @@ class CompanyStatementLackController extends ThinkController
     {
         $mentBtn = [
             "pool"=>"<a class='butn' id='pool'>发起汇总</a>",
-            "export"=>"<a class='butn' id='export'>批量导出</a>",
-            "export_all"=>"<a class='butn' id='export_all'>导出所有</a>"
+            "export"=>"<a class='butn' id='export'>导出所选记录</a>",
+            "export_all"=>"<a class='butn' id='export_all'>导出当前记录</a>"
         ];
         $resarr = [];
         foreach ($mentBtn as $k => $v) {

Application/Admin/Controller/CompanyStatementOfflineController.class.php

@@ -367,8 +367,8 @@ class CompanyStatementOfflineController extends ThinkController
             "setPayment"=>"<a class='butn' id='setPayment'>打款信息确认</a>",
             "returnSetPayment"=>"<a class='butn' id='returnSetPayment'>打款信息确认撤回</a>",
             "doPayment"=>"<a class='butn' id='doPayment'>打款确认</a>",
-            "export"=>"<a class='butn' id='export'>批量导出</a>",
-            "export_all"=>"<a class='butn' id='export_all'>导出所有</a>",
+            "export"=>"<a class='butn' id='export'>导出所选记录</a>",
+            "export_all"=>"<a class='butn' id='export_all'>导出当前记录</a>",
         ];
         $resarr = [];
         foreach ($mentBtn as $k => $v) {

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")

Application/Payment/View/ExcelPayment/lists.html

@@ -187,8 +187,8 @@
                 <a class='butn' id='doPayment'>打款</a>
             </if>
             <a class='butn' id='leadExcel'>Excel导入</a>
-            <a class='butn' id='export'>批量导出</a>
-            <a class='butn' id='export_all'>导出所有</a>
+            <a class='butn' id='export'>导出所选记录</a>
+            <a class='butn' id='export_all'>导出当前记录</a>
 
 <!--            <a class='butn verify' data-value='1'>审核通过</a>-->
 <!--            <a class='butn verify' data-value='2'>审核拒绝</a>-->

Application/Payment/View/Payment/lists.html

@@ -219,8 +219,8 @@
 <!--          <a class='butn return_verify' data-value='0' style="background-color: red;">审核撤回</a>-->
           <a class='butn setPayment'>打款信息确认</a>
           <a class='butn returnSetPayment' id="returnSetPayment">打款信息确认撤回</a>
-          <a class='butn' id='export'>批量导出</a>
-            <a class='butn' id='export_all'>导出所有</a>
+          <a class='butn' id='export'>导出所选记录</a>
+            <a class='butn' id='export_all'>导出当前记录</a>
         </div>
     </div>