From 699449a702afdcebf4251bd7da951278795390f5 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 22 Dec 2020 21:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=BB=93=E7=AE=97=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php  |  1 +
 .../View/CompanyStatementPool/editPuPool.html | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 3d6be41fa..5a8e9f60a 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -357,6 +357,7 @@ class CompanyStatementPoolController extends ThinkController
                 }
             }
         }
+//        dump($infolist);die();
 
         if($is_export){
             $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html
index fe4f57542..80a882d6c 100644
--- a/Application/Admin/View/CompanyStatementPool/editPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html
@@ -264,13 +264,13 @@
                                                 <td><span class="pay_amount">{$account['game_list'][0]['pay_amount']}</span></td>
     <!--                                            <td>{$account['game_list'][0]['ratio']|showNumPercent}</td>-->
     <!--                                            <td>{$account['game_list'][0]['increment_ratio']|showNumPercent}</td>-->
-                                                <td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}]"></td>
-                                                <td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}]" value="{$account['game_list'][0]['ratio']}" style="width: 25px;">%</td>
-                                                <td><input class="increment_ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="increment_ratio[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}]" value="{$account['game_list'][0]['increment_ratio']}" style="width: 25px;">%</td>
+                                                <td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]"></td>
+                                                <td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]" value="{$account['game_list'][0]['ratio']}" style="width: 25px;">%</td>
+                                                <td><input class="increment_ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="increment_ratio[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]" value="{$account['game_list'][0]['increment_ratio']}" style="width: 25px;">%</td>
                                                 <td>
                                                     <span class="sum_money_span">{$account['game_list'][0]['sum_money']}</span>
-                                                    <input class="sum_money" name="sum_money[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}]" value="{$account['game_list'][0]['sum_money']}" style="width: 20px;display: none">
-                                                    <input class="st" name="st[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
+                                                    <input class="sum_money" name="sum_money[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]" value="{$account['game_list'][0]['sum_money']}" style="width: 20px;display: none">
+                                                    <input class="st" name="st[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
                                                 </td>
 
                                                 <notempty name="account['time']">
@@ -309,12 +309,12 @@
                                                         <td><span class="pay_amount">{$game['pay_amount']}</span></td>
     <!--                                                    <td>{$game['ratio']|showNumPercent}</td>-->
     <!--                                                    <td>{$game['increment_ratio']|showNumPercent}</td>-->
-                                                        <td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$account['time']}{$account['account']}]"></td>
-                                                        <td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$game['game_name']}{$account['time']}{$account['account']}]" value="{$game['ratio']}" style="width: 25px;">%</td>
-                                                        <td><input class="increment_ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="increment_ratio[{$com['id']}][{$game['game_name']}{$account['time']}{$account['account']}]" value="{$game['increment_ratio']}" style="width: 25px;">%</td>
+                                                        <td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$account['account']}]"></td>
+                                                        <td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$account['account']}]" value="{$game['ratio']}" style="width: 25px;">%</td>
+                                                        <td><input class="increment_ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="increment_ratio[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$account['account']}]" value="{$game['increment_ratio']}" style="width: 25px;">%</td>
                                                         <td>
-                                                            <span class="sum_money_span">{$game['sum_money']}</span><input class="sum_money" name="sum_money[{$com['id']}][{$game['game_name']}{$account['time']}{$account['account']}]" value="{$game['sum_money']}" style="width: 20px;display: none">
-                                                            <input class="st" name="st[{$com['id']}][{$game['game_name']}{$account['time']}{$account['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
+                                                            <span class="sum_money_span">{$game['sum_money']}</span><input class="sum_money" name="sum_money[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$account['account']}]" value="{$game['sum_money']}" style="width: 20px;display: none">
+                                                            <input class="st" name="st[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$account['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
                                                         </td>
 <!--                                                        <td><input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['withhold']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$account['account']}][]"></td>-->