From 0c69c8f662a631904b1abee1e43c86c80b499bd1 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 27 Oct 2020 09:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=BB=93=E7=AE=97=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/CompanyStatementPool/editPuPool.html   | 14 ++++++++------
 .../View/CompanyStatementPool/viewPcPool.html   | 17 +++++++++--------
 .../View/CompanyStatementPool/viewPuPool.html   | 10 ++++++----
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html
index 31e078431..024288cc1 100644
--- a/Application/Admin/View/CompanyStatementPool/editPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html
@@ -103,7 +103,7 @@
                     <tr>
                         <th>序号</th>
                         <th>下游名称</th>
-                        <th>结算时间</th>
+<!--                        <th>结算时间</th>-->
                         <th>会长账号</th>
 
                         <th>内外团</th>
@@ -113,7 +113,7 @@
                         <th>下游性质</th>
                         <th>产品</th>
                         <th>产品类型</th>
-<!--                        <th>结算时间</th>-->
+                        <th>结算时间</th>
                         <th>推广流水</th>
                         <th>退款</th>
                         <th>分成比例</th>
@@ -147,7 +147,7 @@
                                 <!-- <td rowspan="{$com.statement_count}">{$com.company_info.account}</td> -->
 
                                 <notempty name="com['statement_info']">
-                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
+<!--                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>-->
                                     <td rowspan="{$com['statement_info'][0]['row']}" >{$com['statement_info'][0]['account']}</td>
                                 <else />
                                     <td>-</td>
@@ -162,6 +162,7 @@
                                 <notempty name="com['statement_info'][0]['game_list']">
                                     <td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
                                     <td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
+                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
 <!--                                    <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>-->
                                     <td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
                                     <td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$com['statement_info'][0]['account']}][]"></td>
@@ -239,14 +240,15 @@
                                 <foreach name="com['statement_info']" item="account" key="akey">
                                     <if condition="$akey gt 0">
                                         <tr>
-                                            <notempty name="account['time']">
-                                                <td rowspan="{$account['time_row']}">{$account['time']}</td>
-                                            </notempty>
+
                                             <td rowspan="{$account['row']}" class="accounts">{$account['account']}</td>
 
                                             <notempty name="account['game_list']">
                                                 <td>{$account['game_list'][0]['game_name']}</td>
                                                 <td>{$account['game_list'][0]['game_type_name']}</td>
+                                                <notempty name="account['time']">
+                                                    <td rowspan="{$account['time_row']}">{$account['time']}</td>
+                                                </notempty>
 <!--                                                <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>-->
                                                 <td><span class="pay_amount">{$account['game_list'][0]['pay_amount']}</span></td>
     <!--                                            <td>{$account['game_list'][0]['ratio']|showNumPercent}</td>-->
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
index 01a4a7da5..f9f7e170e 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
@@ -98,7 +98,7 @@
                     <tr>
                         <th>序号</th>
                         <th>公司名称</th>
-                        <th>结算日期</th>
+<!--                        <th>结算日期</th>-->
                         <th>合作产品名称</th>
                         <th>平台总额(元)</th>
                         <th>下游内团分成比例</th>
@@ -110,7 +110,7 @@
                         <th>周结算金额</th>
                         <th>合计/元</th>
                         <th>对账人</th>
-<!--                        <th>结算日期</th>-->
+                        <th>结算日期</th>
                         <th>户名</th>
                         <th>帐号</th>
                         <th>开户行</th>
@@ -128,7 +128,7 @@
                         <tr>
                             <td rowspan="{$com.statement_count}">{$key-0+1}</td>
                             <td rowspan="{$com.statement_count}">{$com.company_name}</td>
-                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>
+<!--                            <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>-->
                             <td>{$com['statement_info'][0]['game_name']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>
                             <td>{$com['statement_info'][0]['ratio']|showNumPercent}</td>
@@ -141,7 +141,7 @@
                             <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>
 
                             <if condition="$com['is_payment'] eq 2">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
@@ -171,9 +171,7 @@
                         <foreach name="com.statement_info" item="it" key="k">
                             <if condition="$k neq 0">
                                 <tr>
-                                    <notempty name="it['time']">
-                                        <td rowspan="{$it['row']}">{$it['time']}</td>
-                                    </notempty>
+
                                     <td>{$it['game_name']}</td>
                                     <td>{$it['pay_amount']}</td>
                                     <td>{$it['ratio']|showNumPercent}</td>
@@ -181,6 +179,9 @@
                                     <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>
                                 </tr>
                             </if>
                         </foreach>
@@ -190,7 +191,6 @@
                         <td>{$count.platform_amount}</td>
                         <td></td>
                         <td></td>
-                        <td></td>
                         <td>{$count.d_statement_money}</td>
                         <td>{$count.fine}</td>
                         <td>{$count.reward}</td>
@@ -204,6 +204,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
                         <if condition="!$is_export">
                             <td></td>
                         </if>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index b92fd29c5..32e791c67 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -101,7 +101,7 @@
                     <tr>
                         <th>序号</th>
                         <th>下游名称</th>
-                        <th>结算时间</th>
+<!--                        <th>结算时间</th>-->
                         <th>会长账号</th>
 
                         <th>内外团</th>
@@ -111,7 +111,7 @@
                         <th>下游性质</th>
                         <th>产品</th>
                         <th>产品类型</th>
-<!--                        <th>结算时间</th>-->
+                        <th>结算时间</th>
                         <th>推广流水</th>
                         <th>退款</th>
                         <th>分成比例</th>
@@ -145,7 +145,7 @@
                                 <!-- <td rowspan="{$com.statement_count}">{$com.company_info.account}</td> -->
 
                                 <notempty name="com['statement_info']">
-                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
+<!--                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>-->
                                     <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['account']}</td>
                                 <else />
                                     <td>-</td>
@@ -161,6 +161,7 @@
                                 <notempty name="com['statement_info'][0]['game_list']">
                                     <td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
                                     <td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
+                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
 <!--                                    <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>-->
                                     <td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
                                     <td>{$com['statement_info'][0]['game_list'][0]['refund']|default=0}</td>
@@ -237,12 +238,13 @@
                                     <if condition="$akey gt 0">
                                         <tr>
 
-                                            <td rowspan="{$account['time_row']}">{$account['time']|default="-----"}</td>
+
                                             <td rowspan="{$account['row']}">{$account['account']}</td>
 
                                             <notempty name="account['game_list']">
                                                 <td>{$account['game_list'][0]['game_name']}</td>
                                                 <td>{$account['game_list'][0]['game_type_name']}</td>
+                                                <td rowspan="{$account['time_row']}">{$account['time']|default="-----"}</td>
 <!--                                                <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>-->
                                                 <td><span class="pay_amount">{$account['game_list'][0]['pay_amount']}</span></td>
     <!--                                            <td>{$account['game_list'][0]['ratio']|showNumPercent}</td>-->