From fecb58efddeb8ff64de9c97cd585b75bfc774eaa Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 4 Jan 2021 21:23:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editSpecialPuPool.html                    | 74 ++++++++++++-------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
index 02709bf51..6952a47c4 100644
--- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
@@ -168,19 +168,19 @@
                                     <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}-->
-                                        <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']}][]">
+                                      <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]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]">
                                     </td>
                                     <td>{$com['statement_info'][0]['game_list'][0]['ratio']}%</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']}][{$com['statement_info'][0]['account']}][]" value="{$com['statement_info'][0]['game_list'][0]['increment_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']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]" value="{$com['statement_info'][0]['game_list'][0]['increment_ratio']}" style="width: 25px;">%</td>
                                     <td><span class="sum_money_span">{$com['statement_info'][0]['game_list'][0]['sum_money']}</span>
-                                        <input class="sum_money" name="sum_money[{$com['id']}][{$com['statement_info'][0]['account']}][]" value="{$com['statement_info'][0]['game_list'][0]['sum_money']}" style="width: 20px;display: none">
-                                        <input class="st" name="st[{$com['id']}][{$com['statement_info'][0]['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
+                                      <input class="sum_money" name="sum_money[{$com['id']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]" value="{$com['statement_info'][0]['game_list'][0]['sum_money']}" style="width: 20px;display: none">
+                                      <input class="st" name="st[{$com['id']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
                                     <td rowspan="{$com.row}">{$com['reward']}</td>
                                     <td rowspan="{$com.row}">{$com['fine']}</td>
                                     <td rowspan="{$com['statement_info'][0]['time_row']}">
 <!--                                        {$com['statement_info'][0]['game_list'][0]['withhold']|default=0}-->
-                                        <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['game_list'][0]['withhold']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$com['statement_info'][0]['account']}][{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}]">
-                                      <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['game_list'][0]['withhold']|default=0}" style="width: 40px;display: none" >
+                                      <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}][{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}]">
+                                      <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;display: none" >
                                     </td>
                                   <td rowspan="{$com['statement_info'][0]['time_row']}"><span class="week_amount">{$com['statement_info'][0]['week_amount']}</span><input style="display: none" class="week_amount_input" value="{$com['statement_info'][0]['week_amount']}"></td>
                                     <td rowspan="{$com.row}" data-st="{$com['st']}" class="statement_money">{$com['statement_money']}</td>
@@ -213,7 +213,7 @@
                                 </if>
                                 <td rowspan="{$com.row}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>
                                 <td rowspan="{$com.row}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
-                                <td rowspan="{$com.row}"><textarea name="remark[{$com['id']}]">{$com.remark}</textarea></td>
+                                <td rowspan="{$com.row}"><textarea name="remark[{$com['id']}][{$com['st']}]">{$com.remark}</textarea></td>
 
                                 <if condition="!$is_export">
                                     <td rowspan="{$com.row}">
@@ -233,10 +233,11 @@
                                             <td>{$game['game_type_name']}</td>
 <!--                                            <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>-->
                                             <td><span class="pay_amount">{$game['pay_amount']}</span></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']}][{$com['statement_info'][0]['account']}][]"></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']}{$com['statement_info'][0]['account']}]"></td>
                                             <td>{$game['ratio']}%</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']}][{$com['statement_info'][0]['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']}][{$com['statement_info'][0]['account']}][]" value="{$game['sum_money']}" style="width: 20px;display: none"></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']}{$com['statement_info'][0]['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']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['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']}{$com['statement_info'][0]['account']}]" value="{$com['st']}" style="width: 20px;display: none"></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']}][{$com['statement_info'][0]['account']}][]"></td>-->
 
                                         </tr>
@@ -263,14 +264,23 @@
                                                 <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['account']}][]"></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>{$account['game_list'][0]['ratio']}%</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['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['account']}][]" value="{$account['game_list'][0]['sum_money']}" style="width: 20px;display: none"></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['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>
+
+                                              <notempty name="account['time']">
+                                                <td rowspan="{$account['time_row']}">{$account['reward']|default=0}</td>
+                                                <td rowspan="{$account['time_row']}">{$account['fine']|default=0}</td>
+                                              </notempty>
+
                                                 <notempty name="account['time']">
                                                     <td rowspan="{$account['time_row']}">
-                                                      <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['withhold_amount']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$account['account']}][{$account['game_list'][0]['statement_begin_time']}]">
-
+                                                      <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['withhold_amount']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']}{$account['account']}][{$account['game_list'][0]['statement_begin_time']}]">
                                                       <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['withhold_amount']|default=0}" style="width: 40px;display: none">
                                                     </td>
                                                   <td rowspan="{$account['time_row']}"><span class="week_amount">{$account['week_amount']}</span><input style="display: none" class="week_amount_input" value="{$account['week_amount']}"></td>
@@ -299,10 +309,13 @@
                                                         <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']}][{$account['account']}][]"></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['time']:$com['statement_info'][0]['time']}{$account['account']}]"></td>
                                                         <td>{$game['ratio']}%</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['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']}][{$account['account']}][]" value="{$game['sum_money']}" style="width: 20px;display: none"></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['time']:$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['time']:$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']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]" value="{$com['st']}" style="width: 20px;display: none">
+                                                        </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>-->
 
                                                     </tr>
@@ -494,6 +507,15 @@
         var week_amount_find = $(_this).parent().parent();
         var old_amount =  week_amount_find.find(".sum_money_span").text();
 
+      //扣款
+      pay_money = parseFloat(pay_money) - parseFloat(refund);
+      var value = (parseFloat(pay_money)*(parseFloat(ratio)/100) + parseFloat(pay_money)*(parseFloat(increment_ratio)/100));
+
+      $(_this).parent().parent().find(".sum_money_span").text(value.toFixed(2));
+      $(_this).parent().parent().find(".sum_money").val(value.toFixed(2));
+
+      var this_amount = week_amount_find.find(".sum_money_span").text();
+
       var week_amount = 0;
       var i = 0;
       for (;;) {
@@ -510,14 +532,14 @@
       }
 
         //扣款
-        pay_money = parseFloat(pay_money) - parseFloat(refund);
-
-        var value = (parseFloat(pay_money)*(parseFloat(increment_ratio)/100));
-
-        $(_this).parent().parent().find(".sum_money_span").text(value.toFixed(2));
-        $(_this).parent().parent().find(".sum_money").val(value.toFixed(2));
-
-        var this_amount = week_amount_find.find(".sum_money_span").text();
+        // pay_money = parseFloat(pay_money) - parseFloat(refund);
+        //
+        // var value = (parseFloat(pay_money)*(parseFloat(increment_ratio)/100));
+        //
+        // $(_this).parent().parent().find(".sum_money_span").text(value.toFixed(2));
+        // $(_this).parent().parent().find(".sum_money").val(value.toFixed(2));
+        //
+        // var this_amount = week_amount_find.find(".sum_money_span").text();
 
         var D_value = parseFloat(old_amount)-parseFloat(this_amount) + parseFloat(withhold-oldwithhold) ;
 

From b073f3e8cda65ee489b7ef520279a9c3a7533793 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 4 Jan 2021 21:38:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editSpecialPuPool.html                    | 67 ++++++++++++++-----
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
index 6952a47c4..63feb87f7 100644
--- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
@@ -375,27 +375,58 @@
         });
     </if>
     $(".no_statement").on("click",function(){
-        var id = $(this).data('id');
-        $.ajax({
-            type: "POST",
-            url: "{:U('cancelStatement')}",
-            dataType: 'json',
-            async: false,
-            data: {id:id},
-            success:function(data){
+      var id = $(this).data('id');
+      saveForm(id);
+    });
+    var return_data = "";
+
+    function saveForm(id) {
+      var options  = {
+        url:"{:U('editCompanyStatementPool')}",  //同action
+        type:'post',
+        beforeSend:function(xhr){
+        },
+        success:function(data)
+        {
+          return_data = data;
+        },
+
+        complete:function(data){
+          if(return_data.status==1){
+
+            $.ajax({
+              type: "POST",
+              url: "{:U('cancelStatement')}",
+              dataType: 'json',
+              async: false,
+              data: {id:id},
+              success:function(data){
                 if(data.status==1){
-                    layer.msg("<font style='color:white'>" + data.info + "</font>");
-                    setTimeout(function(){
-                        window.location.reload();
-                    },1500);
+                  layer.msg("<font style='color:white'>" + data.info + "</font>");
+                  setTimeout(function(){
+                    window.location.reload();
+                  },1500);
                 }else{
-                    layer.msg("<font style='color:white'>" + data.info + "</font>");
-                    return false;
+                  layer.msg("<font style='color:white'>" + data.info + "</font>");
+                  return false;
                 }
-            }
-        });
-    });
-    var return_data = "";
+              }
+            });
+            return;
+          }else{
+            layer.msg("<font style='color:white'>" + 保存数据失败 + "</font>");
+            return false;
+          }
+        },
+        error: function(xhr,status,msg){
+          //alert("状态码"+status+"; "+msg)
+          layer.msg('玩命加载中..');
+
+        }
+      };
+      $("#form").ajaxSubmit(options);
+    }
+
     $("#submit").click(function(){
         var options  = {
             url:"{:U('editCompanyStatementPool')}",  //同action