Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

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 {

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) {?>