From e7b64f27f2e5d183a5e0a408b6ee90b4f7ebe497 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 13 Oct 2020 11:28:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E7=AE=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index f49220582..cd66af626 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -461,7 +461,7 @@
                     // return $(elem).val();
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未汇总][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + "</font>");
                     return;
                 }
                 layer.confirm("重算结算金额会对结算单回退到未申请发票状态，请慎重处理，点击取消停止操作",{title:false}, function(index){    

From 723b3c9fa2722a351ef7915b60ecd4ee856709a8 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 13 Oct 2020 11:30:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E7=AE=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index cd66af626..a6fa2de84 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -464,7 +464,7 @@
                     layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未汇总][申请开票][审批拒绝][汇总审批撤回]状态可以进行重新结算' + "</font>");
                     return;
                 }
-                layer.confirm("重算结算金额会对结算单回退到未申请发票状态，请慎重处理，点击取消停止操作",{title:false}, function(index){    
+                layer.confirm("重算结算金额会对结算单回退到未汇总状态，请慎重处理，点击取消停止操作",{title:false}, function(index){
                     _doReceived();                
                     layer.close(index);
                 });  

From 3f90e1d9ee722b08a5ddbef6c0a0c21597912842 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 13 Oct 2020 11:33:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=87=8D=E7=AE=97=E7=8A=B6=E6=80=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/AggregateFinanceStatement/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index a6fa2de84..2a63fc4a7 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -453,7 +453,7 @@
             //重算金额
             $("#updateStatement").on("click",function(){
                 var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
-                    if($(elem).data("status") == 0 || $(elem).data("status") == 1 || $(elem).data("status") == -1 || $(elem).data("status") == -3){
+                    if($(elem).data("status") == 0 || $(elem).data("status") == -1 || $(elem).data("status") == -3){
                         return $(elem).val();
                     }else{
                         flag = true;