From 54a0fde480272970f79b899bcc9f71648c554808 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 29 Oct 2020 19:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=85=AC=E5=8F=B8=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php  |  8 +++----
 .../View/CompanyStatementPool/viewCpPool.html | 12 +++++------
 .../View/CompanyStatementPool/viewPcPool.html | 21 +++++++++++--------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 7b869787e..62cb362d5 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -681,8 +681,8 @@ class CompanyStatementPoolController extends ThinkController
 //
 //            }
 //
-            $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
-            $v['statement_info'] = $handle_data;
+//            $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
+//            $v['statement_info'] = $handle_data;
 //            dump($handle_data);
 
 
@@ -826,8 +826,8 @@ class CompanyStatementPoolController extends ThinkController
                 }
             }
 
-            $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
-            $v['statement_info'] = $handle_data;
+//            $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
+//            $v['statement_info'] = $handle_data;
 //            dump($v['statement_info']);
 
             $v['matche_platform'] = $Partner[$v['company_id']];
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
index 7b37383a1..e0cc3468c 100644
--- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
@@ -111,7 +111,7 @@
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">合作方待结算分成</th>
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">违规罚款</th>
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">奖励</th>
-                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">周结算金额</th>
+<!--                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">周结算金额</th>-->
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">合作待结算金额</th>
 
                         <th rowspan=2 style="border-right: solid 1px #b6cad2;">是否结算</th>
@@ -154,7 +154,7 @@
 
                             <td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
                             <td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
-                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
+<!--                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>-->
                             <td rowspan="{$com.statement_count}">{$com['statement_money']}</td>
                             
                             <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
@@ -187,10 +187,10 @@
                         <foreach name="com.statement_info" item="it" key="k">
                             <if condition="$k neq 0">
                                 <tr>
-<!--                                    <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>-->
-                                    <notempty name="it['time']">
-                                        <td rowspan="{$it['row']}">{$it['time']}</td>
-                                    </notempty>
+                                    <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
+<!--                                    <notempty name="it['time']">-->
+<!--                                        <td rowspan="{$it['row']}">{$it['time']}</td>-->
+<!--                                    </notempty>-->
                                     <td>{$it['game_name']}</td>
                                     <td>{$it['pay_amount']}</td>
                                     <td>{$it['pay_amount']}</td>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
index f9f7e170e..e86f97538 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
@@ -107,7 +107,7 @@
                         <th>分成金额/元</th>
                         <th>罚款</th>
                         <th>奖励</th>
-                        <th>周结算金额</th>
+<!--                        <th>周结算金额</th>-->
                         <th>合计/元</th>
                         <th>对账人</th>
                         <th>结算日期</th>
@@ -137,11 +137,11 @@
                             <td>{$com['statement_info'][0]['d_statement_money']}</td>
                             <td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
                             <td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
-                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
+<!--                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>-->
                             <td rowspan="{$com.statement_count}">{$com['statement_money']}</td>
                             <td rowspan="{$com.statement_count}">{$com.settlement_contact}</td>
-                            <!--<td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>-->
-                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>
+                            <td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>
+<!--                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>-->
 
                             <if condition="$com['is_payment'] eq 2">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
@@ -178,10 +178,13 @@
                                     <td>{$it['increment_ratio']|showNumPercent}</td>
                                     <td>{$it['fax_ratio']|showNumPercent}</td>
                                     <td>{$it['d_statement_money']}</td>
-<!--                                    <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>-->
-                                    <notempty name="it['time']">
-                                        <td rowspan="{$it['row']}">{$it['time']}</td>
-                                    </notempty>
+                                    <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
+<!--                                    <notempty name="it['time']">-->
+<!--                                        <td rowspan="{$it['row']}">{$it['week_amount']}</td>-->
+<!--                                    </notempty>-->
+<!--                                    <notempty name="it['time']">-->
+<!--                                        <td rowspan="{$it['row']}">{$it['time']}</td>-->
+<!--                                    </notempty>-->
                                 </tr>
                             </if>
                         </foreach>
@@ -195,7 +198,7 @@
                         <td>{$count.fine}</td>
                         <td>{$count.reward}</td>
                         <td>{$count.statement_money}</td>
-                        <td>{$count.statement_money}</td>
+<!--                        <td>{$count.statement_money}</td>-->
                         <td></td>
                         <td></td>
                         <td></td>