From 400a9b3dede49f1b3e91e21ebcb626fe9441dea7 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 14 Sep 2020 13:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AggregateFinanceStatementController.class.php  |  4 ++++
 .../AggregateStatementPoolController.class.php     | 14 +++-----------
 .../View/AggregateFinanceStatement/lists.html      |  4 ++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 140ede852..21acb9bae 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -8,6 +8,7 @@ namespace Admin\Controller;
 class AggregateFinanceStatementController extends ThinkController
 {
     public $verify_status = [
+        "-3"=>"撤销汇总",
         "-1"=>"审批拒绝", 
         "0"=>"未申请开票", 
         "1"=>"申请开票", 
@@ -667,6 +668,9 @@ class AggregateFinanceStatementController extends ThinkController
         //操作对应菜单
         $optist = [];
         switch ($info['verify_status']) {
+            case '-3':
+                $optist = ["viewStatement","editStatement","addRemark","viewRemark","editRemark"];
+                break;
             case '-1':
                 $optist = ["viewStatement","cancelVerify","addRemark","viewRemark","editRemark"];
                 break;
diff --git a/Application/Admin/Controller/AggregateStatementPoolController.class.php b/Application/Admin/Controller/AggregateStatementPoolController.class.php
index 2e6ec696a..a8377b253 100644
--- a/Application/Admin/Controller/AggregateStatementPoolController.class.php
+++ b/Application/Admin/Controller/AggregateStatementPoolController.class.php
@@ -729,11 +729,7 @@ class AggregateStatementPoolController extends ThinkController
         }
         if($re_op){
             //公司及上游回退
-            if($db_res['company_type'] == 2){
-                $this->retry($db_res); //个人重算
-            }else{
-                $this->cancelCompanyPool($db_res);//公司撤回
-            }
+            $this->cancelCompanyPool($db_res);//公司撤回
         }
 
     }
@@ -829,12 +825,8 @@ class AggregateStatementPoolController extends ThinkController
             $this->ajaxReturn(array('status' => 0,"info"=>"撤销汇总失败"));
         }
         //修改结算单信息
-        $st_res = M("aggregate_statement","tab_")->field("id,verify_status,verify_log")->where("id in ({$sids})")->select();
+        $st_res = M("aggregate_statement","tab_")->field("id,verify_status")->where("id in ({$sids})")->select();
         foreach($st_res as $k=>&$v){
-            $v['verify_log'] = json_decode($v['verify_log'],true);
-            $v['verify_log']['pool_user']=$this->admininfo["username"];
-            $v['verify_log']['pool_time']=date("Y-m-d H:i:s");
-            $v['verify_log'] = json_encode($v['verify_log']);
             $v['verify_status']=-3;
             $stres =  M("aggregate_statement","tab_")->save($v);
             if($stres === false){
@@ -932,7 +924,7 @@ class AggregateStatementPoolController extends ThinkController
             default:
                 break;
         }
-        $optist = ["viewPool"];
+        $optist = ["viewPool","cancelPool"];
         //
         if($info['platform_amount'] <= 0 && $info['company_type'] != 2){
             $optist = array_diff($optist, ["viewPool"]);
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index 782380f03..bbef2a132 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -234,7 +234,7 @@
             $("#pool").on("click",function(){
                 var flag = false;
                 var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
-                    if($(elem).data("status") != 3){
+                    if($(elem).data("status") >= 3||$(elem).data("status") == -3){
                         flag = true;
                     }else{
                         return $(elem).val();
@@ -245,7 +245,7 @@
                     return;
                 }
                 if(flag){
-                    layer.confirm("发起汇总仅会对 [已审核通过] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
+                    layer.confirm("发起汇总仅会对 [已开票] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){
                         _doPoolApply();
                         layer.close(index);
                     });