From deeb4b865bedefdaf679f610ab7ac5f7b80fbe62 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 14 Sep 2020 14:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=B1=87=E6=80=BB=E5=8D=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/AggregateFinanceStatement/lists.html | 6 +++---
 .../Admin/View/AggregateStatementPool/viewPuPool.html       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index bbef2a132..3b248f9dd 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -234,18 +234,18 @@
             $("#pool").on("click",function(){
                 var flag = false;
                 var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
-                    if($(elem).data("status") >= 3||$(elem).data("status") == -3){
+                    if($(elem).data("status") == -1||$(elem).data("status") == 0){
                         flag = true;
                     }else{
                         return $(elem).val();
                     }
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要审批通过的结算单,仅[已审核通过]状态可以进行审批通过' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要审批通过的结算单,[审核拒绝,系统生成结算单]状态不可以进行审批通过' + "</font>");
                     return;
                 }
                 if(flag){
-                    layer.confirm("发起汇总仅会对 [已开票] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
+                    layer.confirm("发起汇总不会对 [审核拒绝,系统生成结算单] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
                         _doPoolApply();
                         layer.close(index);
                     });  
diff --git a/Application/Admin/View/AggregateStatementPool/viewPuPool.html b/Application/Admin/View/AggregateStatementPool/viewPuPool.html
index 4bcc05311..993c9d262 100644
--- a/Application/Admin/View/AggregateStatementPool/viewPuPool.html
+++ b/Application/Admin/View/AggregateStatementPool/viewPuPool.html
@@ -136,7 +136,7 @@
                             <td rowspan="{$com.statement_count}">聚合</td>
 
                             <td>{$com['statement_info'][0]['game_name']}</td>
-                            <td>{$com['statement_info'][0]['game_type_name']}</td>
+                            <td>{$com['statement_info'][0]['game_type']}</td>
                             <td>{$com['statement_info'][0]['begintime']} - {$com['statement_info'][0]['endtime']}</td>
                             <td>{$com['statement_info'][0]['money']}</td>
                             <if condition="$com['statement_info'][0]['statement_type'] neq 0">
@@ -183,7 +183,7 @@
                             <if condition="$k neq 0">
                                 <tr>
                                     <td>{$it['game_name']}</td>
-                                    <td>{$it['game_type_name']}</td>
+                                    <td>{$it['game_type']}</td>
                                     <td>{$it['begintime']} - {$it['endtime']}</td>
                                     <td>{$it['money']}</td>