Your Name 3 年之前
父節點
當前提交
688542a3cc
共有 4 個文件被更改,包括 28 次插入8 次删除
  1. 6 5
      service/bill/database/cash.php
  2. 4 2
      service/bill/database/tixian.php
  3. 2 1
      service/bill/lib/Cash.php
  4. 16 0
      service/bill/lib/Tixian.php

+ 6 - 5
service/bill/database/cash.php

@@ -149,7 +149,7 @@ return array
             'search'    => 'fulltext',
             'list'      => true,
             'list_name' => '流水号<br />交易时间',
-            'list'      =>'Dever::load("bill/lib/cash.order_num", {id})',
+            'list'      =>'Dever::load("bill/lib/cash.order_num#num", {id})',
             'list_order'  => 1,
         ),
 
@@ -198,8 +198,9 @@ return array
             'desc'      => '金额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
-            'list_order' => 6,
+            'list_name' => '金额<br />操作后余额',
+            'list'      =>'Dever::load("bill/lib/cash.order_num#cash", {id})',
+             'list_order' => 6,
         ),
 
         'yue'      => array
@@ -210,8 +211,8 @@ return array
             'desc'      => '操作后余额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
-            'list_order' => 7,
+            // 'list'      => true,
+            // 'list_order' => 7,
         ),
 
         'status'        => array

+ 4 - 2
service/bill/database/tixian.php

@@ -177,6 +177,8 @@ return array
             'search'    => 'select',
             'list'      => true,
             'option'	=> $cash_status,
+            'list_name' => '交易状态<br />发放状态',
+            'list'      => 'Dever::load("bill/lib/tixian.order_num#status",{id})',
             'list_order' => 9,
         ),
 
@@ -190,8 +192,8 @@ return array
             'update'  	=> 'hidden',
             'option'    => $status,
             'search'    => 'select',
-            'list'      => true,
-            'list_order' => 10,
+            // 'list'      => true,
+            // 'list_order' => 10,
         ),
 
         'audit'        => array

+ 2 - 1
service/bill/lib/Cash.php

@@ -252,7 +252,8 @@ class Cash
     public function order_num($id){
         $info = Dever::db('bill/cash')->find($id);
         $cdate = date('Y-m-d H:i',$info['cdate']);
-        $html = $info['order_num'].'<br/>'.$cdate;
+        $html['num'] = $info['order_num'].'<br/>'.$cdate;
+        $html['cash'] = $info['cash'] . '<br />' . $info['yue'];
         return $html;
     }
 

+ 16 - 0
service/bill/lib/Tixian.php

@@ -50,6 +50,22 @@ class Tixian
         }
         $html['name'] = $info['order_num'].'<br />'.$cdate.'<br />'.$operdate;
         $html['money'] = $info['ycash'].'<br />'.$info['cash'].'<br />'.$info['yue'];
+        $cash = Dever::db('bill/cash')->find($id);
+        if($cash['status']==1){
+            $name = '待审核';
+        }elseif($cash['status']==2){
+            $name = '已审核';
+        }elseif($cash['status']==3){
+            $name = '已作废';
+        }
+        if($info['status']==-1){
+            $status = '未审核待发放';
+        }elseif($info['status']==1){
+            $status = '已审核待发放';
+        }elseif($info['status']==2){
+            $status = '已发放';
+        }
+        $html['status'] = $name.'<br/>'.$status;
         return $html;
     }
 }