From c05b10cb87a1084a459cf0c01c01b734e7db31eb Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 20 Feb 2020 10:54:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E3=80=8B=E6=9C=AA=E5=AE=A1=E6=A0=B8=E4=B8=8D=E5=8F=AF=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/VerifyBillController.class.php | 13 ++++++++++++-
 Application/Admin/View/VerifyBill/index.html        |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/VerifyBillController.class.php b/Application/Admin/Controller/VerifyBillController.class.php
index 1c2344f53..7473253d7 100644
--- a/Application/Admin/Controller/VerifyBillController.class.php
+++ b/Application/Admin/Controller/VerifyBillController.class.php
@@ -38,6 +38,13 @@ class VerifyBillController extends Controller {
             ->select();
         foreach ($list_data as $key => $value) {
             $list_data[$key]['statement_type_str'] = $value['statement_type'] ? '工会对账单' : 'cp对账单';
+            if ($value['verify_status'] == 1) {
+                $list_data[$key]['verify_status_str'] = '审核通过';
+            } elseif ($value['verify_status'] == 1) {
+                $list_data[$key]['verify_status_str'] = '审核拒绝';
+            } else {
+                $list_data[$key]['verify_status_str'] = '未审核';
+            }
         }
         $this->assign('list_data', $list_data);
         $this->assign('meta_title', $m_title);
@@ -61,7 +68,11 @@ class VerifyBillController extends Controller {
         $this->assign('all_sum_money', $all_sum_money);
         $this->assign('all_pay_amount', $all_pay_amount);
         $this->assign('data', $data);
-        $this->assign('from', I('from'));
+        $from = I('from');
+        if (empty($from) && $data['verify_status'] != 1) {//未审核通过不可确认
+            $from = 'not_verify';
+        }
+        $this->assign('from', $from);
         if ($data['statement_type'] == 1) {//下游
             $template = 'company_show';
         } else {
diff --git a/Application/Admin/View/VerifyBill/index.html b/Application/Admin/View/VerifyBill/index.html
index 7d5224802..24a50b496 100644
--- a/Application/Admin/View/VerifyBill/index.html
+++ b/Application/Admin/View/VerifyBill/index.html
@@ -48,6 +48,7 @@
                         <th>生成时间</th>
                         <th>对账单日期</th>
                         <th>对账金额</th>
+                        <th>审核状态</th>
                         <th>确认状态</th>
                         <th>操作</th>
                     </tr>
@@ -67,6 +68,7 @@
                                 <td>{:set_show_time($data['create_time'])}</td>
                                 <td>{:set_show_time($data['statement_begin_time'])}-{:set_show_time($data['statement_end_time'])}</td>
                                 <td>{$data.statement_money}</td>
+                                <td>{$data.verify_status_str}</td>
 
                                 <td>
                                     <?php if($data['is_confirm'] == 0) {?>