From 58c8508ce438c00043dec6fbff6440219dba8203 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 11 Jul 2020 17:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecp=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PartnerController.class.php    |  2 +-
 Application/Admin/View/Partner/export.html    | 48 +++++++++++++++----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 0c7d24358..f3376e6f6 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -153,6 +153,7 @@ class PartnerController extends ThinkController
 
             $value['game'] = $parseGames[$value['id']];
             $value['has_advance_charge'] = $value['has_advance_charge'] ? '是' : '否';
+            $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
             $value['channel_rate'] *= 100;
             $value['invoice_rate'] *= 100;
 
@@ -173,7 +174,6 @@ class PartnerController extends ThinkController
             $value['row'] = empty($row2) ? 1: $row2;
             $parseData[] = $value;
         }
-        dd($parseData);
         if($is_export){
             $this->assign('listData', $parseData);
             $GetData = $_GET;
diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html
index b1c146414..32e5febde 100644
--- a/Application/Admin/View/Partner/export.html
+++ b/Application/Admin/View/Partner/export.html
@@ -7,7 +7,9 @@
 <script type="text/javascript" src="__JS__/select2.min.js"></script>
     <script src="__STATIC__/table2excel.js"></script>
     <style>
-
+        html{
+            opacity: 0;
+        }
         .select2-container--default .select2-selection--single {
             color: #000;
             resize: none;
@@ -43,7 +45,7 @@
             如果导出成功你也可以手动关闭此页面
         </div> -->
         <div class="">
-            <table border="1">
+            <table border="1" id="exporttable">
                 <!-- 表头 -->
                 <thead>
                 <tr>
@@ -64,6 +66,21 @@
 
                     <th>是否有预付款</th>
                     <th>是否为收款方</th>
+
+                    <th>预付款金额</th>
+                    <th>是否签署合同</th>
+                    <th>合同期限</th>
+                    <th>生效期限</th>
+                    <th>开票税点</th>
+
+                    <th>发票类型</th>
+                    <th>渠道费率</th>
+                    <th>注册地址</th>
+                    <th>注册电话</th>
+                    <th>联系人</th>
+
+                    <th>联系电话</th>
+                    <th>联系地址</th>
                 </tr>
                 </thead>
 
@@ -98,11 +115,26 @@
 
                             <td rowspan="{$data.row}">{$data.settlement_type}</td>
                             <td rowspan="{$data.row}">{$data.payee_name}</td>
-                            <td rowspan="{$data.row}">{$data.bank_account}</td>
+                            <td rowspan="{$data.row}">&nbsp;{$data.bank_account}</td>
                             <td rowspan="{$data.row}">{$data.opening_bank}</td>
                             <td rowspan="{$data.row}">{$data.has_advance_charge}</td>
-
                             <td rowspan="{$data.row}">{$data.is_collection}</td>
+
+                            <td rowspan="{$data.row}">{$data.advance_amount}</td>
+                            <td rowspan="{$data.row}">{$data.is_sign_contract}</td>
+                            <td rowspan="{$data.row}">{$data.contract_time}</td>
+                            <td rowspan="{$data.row}">{$data.validity_time}</td>
+                            <td rowspan="{$data.row}">{$data.invoice_rate}%</td>
+
+                            <td rowspan="{$data.row}">{$data.invoice_type}</td>
+                            <td rowspan="{$data.row}">{$data.channel_rate}%</td>
+                            <td rowspan="{$data.row}">{$data.reg_address}</td>
+                            <td rowspan="{$data.row}">{$data.reg_phone}</td>
+                            <td rowspan="{$data.row}">{$data.link_man}</td>
+
+                            <td rowspan="{$data.row}">{$data.link_phone}</td>
+                            <td rowspan="{$data.row}">{$data.address}</td>
+
                         </tr>
                         <if condition="$data['game'][0]['row'] gt 1">
                             <foreach name="data['game'][0]['game_ratio']" item="game_ratio" key="gamekey">
@@ -187,9 +219,9 @@
     $(".select_gallery").select2();
 </script>
 <script type="text/javascript">
-    // $("#exporttable").table2excel({
-    //     filename: "合作方.xls", // do include extension
-    //     preserveColors: false // set to true if you want background colors and font colors preserved
-    // });
+    $("#exporttable").table2excel({
+        filename: "合作方.xls", // do include extension
+        preserveColors: false // set to true if you want background colors and font colors preserved
+    });
 </script>
 </block>