edit

database/info_log.php

@@ -279,7 +279,7 @@ return array
             'desc'      => '状态',
             'match'     => 'is_numeric',
             'option'    => $status,
-            'list'      => true,
+            'list'      => 'Dever::load("account/lib/log.status", {type_id}, {status})',
         ),
 
         'audit_admin'     => array
@@ -361,6 +361,7 @@ return array
         'list_button' => array
         (
             'edit' => array('审核', 'audit_status,audit_desc', '{status} == 1'),
+            'edit' => array('发放', 'audit_status,audit_desc', '{status} == 2 && {type_id} == 2'),
         ),
     ),
 

lib/Log.php

@@ -77,25 +77,32 @@ class Log
             $info['username'] = $source[$project['source_name']];
         }
         $info['config_name'] = $config['name'];
-        if ($info['type_id'] == 2) {
-            if ($info['status'] == 1) {
-                $info['status_name'] = '待审核';
-            } elseif ($info['status'] == 2) {
-                $info['status_name'] = '已审核（待发放）';
-            } elseif ($info['status'] == 3) {
-                $info['status_name'] = '已审核（已发放）';
-            } else {
-                $info['status_name'] = '已作废';
-            }
-        } elseif ($info['status'] == 2) {
-            $info['status_name'] = '已入账';
-        } else {
-            $info['status_name'] = '待入账';
-        }
-        
+        $info['status_name'] = $this->status($info['type_id'], $info['status']);
         $info['type_name'] = Dever::load("account/config_type-one#name", $info['type_id']);
         $info['cdate'] = date('Y-m-d H:i', $info['cdate']);
         $info['fee'] = Dever::number($info['ycash'] - $info['cash']);
         return $info;
     }
+
+    # 获取状态名称
+    public function status($type, $status)
+    {
+        if ($type == 2) {
+            if ($status == 1) {
+                $status_name = '待审核';
+            } elseif ($status == 2) {
+                $status_name = '已审核（待发放）';
+            } elseif ($status == 3) {
+                $status_name = '已审核（已发放）';
+            } else {
+                $status_name = '已作废';
+            }
+        } elseif ($status == 2) {
+            $status_name = '已入账';
+        } else {
+            $status_name = '待入账';
+        }
+
+        return $status_name;
+    }
 }

lib/Manage.php

@@ -155,7 +155,11 @@ class Manage
                 }
                 # 已作废
                 if ($audit == 4) {
-                    Dever::load('account/lib/info.up_commit', $info['uid'], $info['cash'], 'tixian_zuofei', 'qianbao', $desc, 'account/pay', $order['id']);
+                    $update = array();
+                    $update['where_id'] = $info['info_id'];
+                    $update['set_cash'] = $info['cash'];
+                    $update['set_col'] = $info['cash'];
+                    Dever::db('account/info')->inc($update);
                 }
 
                 $update = array('where_id' => $id, 'status' => $audit, 'audit_date' => time());