edit

service/agent/database/member.php

@@ -305,7 +305,7 @@ return array
             'search'	=> 'select',
             'update'    => 'select',
             'option'    => $role,
-            'list'      => ($pmid) ? true : false,
+            // 'list'      => ($pmid) ? true : false,
         ),
 
         'level_id'		=> array

service/agent/database/member_agreement.php

@@ -318,7 +318,9 @@ return array
             'match'     => 'is_numeric',
             'desc'      => '更新时间',
             'search'    => 'date',
-            'list'      => 'date("Y-m-d H:i", {udate})',
+            // 'list'      => 'date("Y-m-d H:i", {udate})',
+            'list_name' => '创建时间<br/>更新时间',
+            'list'      => 'Dever::load("agent/lib/agreement.data",{id})',
             'list_order' => 5,
         ),
 
@@ -362,8 +364,8 @@ return array
             # 只有insert时才生效
             'insert'    => true,
             //'search'    => 'date',
-            'list'      => 'date("Y-m-d H:i", {cdate})',
-            'list_order' => 4,
+            // 'list'      => 'date("Y-m-d H:i", {cdate})',
+            // 'list_order' => 4,
         ),
     ),
 

service/agent/database/member_area.php

@@ -99,7 +99,7 @@ return array
             'search'    => 'select',
             'update'    => 'checkbox',
             'option'    => $role,
-            'list'      => true,
+            // 'list'      => true,
         ),
 
         'area'       => array

service/agent/lib/Agreement.php

@@ -1140,4 +1140,11 @@ class Agreement
 
         $pdf->out($name);
     }
+    public function data($id){
+        $info = Dever::db('agent/member_agreement')->find($id);
+        $cdate = date('Y-m-d H:i',$info['cdate']);
+        $udate = date('Y-m-d H:i',$info['udate']);
+        $html = $cdate.'<br />'.$udate;
+        return $html;
+    }
 }

service/agent/lib/Member.php

@@ -539,14 +539,14 @@ class Member
     public function daili($id){
         $info=Dever::db('agent/member')->one(array('id'=>$id,'state'=>1));
         $member['role'] = Dever::db('setting/role')->find($info['role']);
-        $data['姓名']='<a href='.Dever::url('project/database/list&project=bill&table=sell&menu=bill&search_option_state=1&function=&method=search&search_api_mid='.$info['mobile'].'&search_fulltext_order_num=&search_option_start_cdate=&search_option_end_cdate=&excel=2&page_type=2', 'manage').'>'.$info['name'].'</a>';
-        $data['电话']=$info['mobile'];
-        $data['角色']=$member['role']['name'];
+        $name ='<a href='.Dever::url('project/database/list&project=bill&table=sell&menu=bill&search_option_state=1&function=&method=search&search_api_mid='.$info['mobile'].'&search_fulltext_order_num=&search_option_start_cdate=&search_option_end_cdate=&excel=2&page_type=2', 'manage').'>'.$info['name'].'</a>';
+        $mobile = $info['mobile'];
+        $role = $member['role']['name'];
         if (isset($info['level_id']) && $info['level_id'] && $info['level_id'] > 0) {
                 $info['level'] = Dever::db('setting/level')->find($info['level_id']);
-                $data['角色'] .= '（'.$info['level']['name'].'）';
+                $role .= '（'.$info['level']['name'].'）';
         }
-        $html=Dever::table($data);
+        $html = $name.'<br/>'.$mobile.'<br/>'.$role;
         return $html;
     }
     #上级信息
@@ -563,14 +563,15 @@ class Member
                     $data['角色'] .= '（'.$info['level']['name'].'）';
             }                
             $data['团队业绩']=$info['group_sell'];
+            $html = $data['姓名'].'<br/>'.$data['电话'].'<br/>'.$data['角色'].'<br/>'.$data['团队业绩'];
+            return $html;
         }elseif($res['source_id']){
             $source=Dever::db('setting/source')->one(array('id'=>$res['source_id'],'state'=>1));
             $data['来源']=$source['name'];
+            return $html =$data['来源'];
         }else{
             return '无';
-        }
-        $html=Dever::table($data);
-        return $html;
+        }        
     }
 
     public function search_api()

service/bill/database/cash.php

@@ -101,9 +101,9 @@ return array
                 'col' => 'mobile',
                 'result' => 'id',
             ),
-            'list_name' => '手机号',
-            'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            'list_order' => 4,
+            // 'list_name' => '手机号',
+            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
+            // 'list_order' => 4,
         ),
 
         'agent-member-name'=> array
@@ -121,6 +121,8 @@ return array
                 'col' => 'name',
                 'result' => 'id',
             ),
+            'list_name' => '姓名<br />手机号<br />代理角色',
+            'list'      =>'Dever::load("agent/lib/member.getOne", {id})',
             'list_order' => 3,
         ),
 
@@ -132,8 +134,8 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
-            'list_order' => 5,
+            // 'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
+            // 'list_order' => 5,
         ),
 
         'order_num'      => array
@@ -146,6 +148,8 @@ return array
             'update'    => 'text',
             'search'    => 'fulltext',
             'list'      => true,
+            'list_name' => '流水号<br />交易时间',
+            'list'      =>'Dever::load("bill/lib/cash.order_num", {id})',
             'list_order'  => 1,
         ),
 
@@ -290,8 +294,8 @@ return array
             # 只有insert时才生效
             //'insert'    => true,
             'search'    => 'date',
-            'list'      => 'date("Y-m-d H:i", {cdate})',
-            'list_order'  => 2,
+            // 'list'      => 'date("Y-m-d H:i", {cdate})',
+            // 'list_order'  => 2,
         ),
     ),
 

service/bill/database/goods_stat.php

@@ -2,6 +2,12 @@
 
 $type = Dever::db('setting/role_goods')->config['set']['type'];
 
+if (Dever::load('manage/auth')->checkFunc('menu_268.menu_272', 'edit1', '导出数据')) {
+    $excel = true;
+}else{
+    $excel = false;
+}
+
 return array
 (
     # 表名
@@ -177,7 +183,7 @@ return array
         'insert' => false,
         'delete' => false,
         'edit' => false,
-        'excel' => true,
+        'excel' => $excel,
     ),
 
     'request' => array

service/bill/database/member_stat.php

@@ -1,5 +1,10 @@
 <?php
 
+if (Dever::load('manage/auth')->checkFunc('bill.member_stat', 'edit1', '导出数据')) {
+    $excel = true;
+}else{
+    $excel = false;
+}
 $config = array
 (
     # 表名
@@ -137,7 +142,7 @@ $config = array
         'edit' => false,
         'delete' => false,
         'num' => false,
-        'excel' => true,
+        'excel' => $excel,
     ),
 
     # request 请求接口定义

service/bill/database/order_stat.php

@@ -1,5 +1,10 @@
 <?php
 
+if (Dever::load('manage/auth')->checkFunc('bill.order_stat', 'edit1', '导出数据')) {
+    $excel = true;
+}else{
+    $excel = false;
+}
 $config = array
 (
     # 表名
@@ -115,7 +120,7 @@ $config = array
         'edit' => false,
         'delete' => false,
         'num' => false,
-        'excel' => true,
+        'excel' => $excel,
     ),
 
     # request 请求接口定义

service/bill/database/sell.php

@@ -76,9 +76,9 @@ return array
                 'col' => 'mobile',
                 'result' => 'id',
             ),
-            'list_name' => '手机号',
-            'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            'list_order' => 4,
+            // 'list_name' => '手机号',
+            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
+            // 'list_order' => 4,
         ),
 
         'agent-member-name'=> array
@@ -98,6 +98,8 @@ return array
                 'search' => 'mid',
             ),
             'list'      => true,
+            'list_name' => '姓名<br />手机号<br />代理角色',
+            'list'      =>'Dever::load("agent/lib/member.getOne", {id})',
             'list_order' => 3,
         ),
 
@@ -109,8 +111,8 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
-            'list_order' => 5,
+            // 'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
+            // 'list_order' => 5,
         ),
 
         'order_num'      => array

service/bill/database/sell_stat.php

@@ -48,9 +48,9 @@ return array
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list_name' => '手机号',
-            'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            'list_order' => 4,
+            // 'list_name' => '手机号',
+            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
+            // 'list_order' => 4,
         ),
 
         'agent-member-name'=> array
@@ -70,7 +70,7 @@ return array
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list_name' => '代理商信息',
+            'list_name' => '代理商',
             'list'      => 'Dever::load("agent/lib/member.daili", {mid})',
             'list_order' => 3,
         ),
@@ -82,7 +82,7 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => true,
+            // 'list'      => true,
             // 'search'    => 'fulltext',
             'search'    => array
             (
@@ -91,7 +91,7 @@ return array
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list_name' => '上级代理商信息',
+            'list_name' => '上级代理商',
             'list'      => 'Dever::load("agent/lib/member.sdaili", {mid})',
             'list_order' => 4,
         ),
@@ -103,8 +103,8 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
-            'list_order' => 5,
+            // 'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
+            // 'list_order' => 5,
         ),
 
         'num'      => array

service/bill/database/tixian.php

@@ -71,9 +71,9 @@ return array
                 'col' => 'mobile',
                 'result' => 'id',
             ),
-            'list_name' => '手机号',
-            'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
-            'list_order' => 4,
+            // 'list_name' => '手机号',
+            // 'list'      => 'Dever::load("agent/member-find#mobile", {mid})',
+            // 'list_order' => 4,
         ),
 
         'agent-member-name'=> array
@@ -86,6 +86,8 @@ return array
             'sync'      => array('mid', 'id'),
             'list'      => true,
             'search'    => 'fulltext',
+            'list_name' => '姓名<br />手机号<br />代理角色',
+            'list'      =>'Dever::load("agent/lib/member.getOne", {id})',
             'list_order' => 3,
         ),
 
@@ -97,8 +99,8 @@ return array
             'match'     => 'option',
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
-            'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
-            'list_order' => 5,
+            // 'list'      => 'Dever::load("setting/role-find#name", "{agent-member-role}")',
+            // 'list_order' => 5,
         ),
 
         'order_num'      => array
@@ -111,6 +113,8 @@ return array
             'update'    => 'text',
             'search'    => 'fulltext',
             'list'      => true,
+            'list_name' => '流水号<br />交易时间<br />发放时间',
+            'list'      => 'Dever::load("bill/lib/tixian.order_num#name",{id})',
             'list_order'  => 1,
         ),
 
@@ -123,6 +127,8 @@ return array
             'match'     => 'is_numeric',
             'update'    => 'text',
             'list'      => true,
+            'list_name' => '提现金额<br />实际提现金额<br />提现后余额',
+            'list'      => 'Dever::load("bill/lib/tixian.order_num#money",{id})',
             'list_order' => 6,
         ),
 
@@ -134,8 +140,8 @@ return array
             'desc'      => '提现金额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
-            'list_order' => 7,
+            // 'list'      => true,
+            // 'list_order' => 7,
         ),
 
         'yue'      => array
@@ -146,8 +152,8 @@ return array
             'desc'      => '提现后余额',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
-            'list_order' => 8,
+            // 'list'      => true,
+            // 'list_order' => 8,
         ),
 
         'cash_id'      => array
@@ -243,8 +249,8 @@ return array
             'default'   => '',
             'match'     => 'is_numeric',
             'desc'      => '',
-            'list'      => '"{operdate}" > 0 ? date("Y-m-d H:i", {operdate}) : "-"',
-            'list_order'  => 11,
+            // 'list'      => '"{operdate}" > 0 ? date("Y-m-d H:i", {operdate}) : "-"',
+            // 'list_order'  => 11,
         ),
 
         'state'     => array
@@ -265,8 +271,8 @@ return array
             # 只有insert时才生效
             //'insert'    => true,
             'search'    => 'date',
-            'list'      => 'date("Y-m-d H:i", {cdate})',
-            'list_order'  => 2,
+            // 'list'      => 'date("Y-m-d H:i", {cdate})',
+            // 'list_order'  => 2,
         ),
     ),
 

service/bill/lib/Cash.php

@@ -249,4 +249,11 @@ class Cash
 
         return $html;
     }
+    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;
+        return $html;
+    }
+
 }

service/bill/lib/Tixian.php

@@ -41,4 +41,15 @@ class Tixian
             return $this->getOrderId();
         }
     }
+    public function order_num($id){
+        $info = Dever::db('bill/tixian')->find($id);
+        $cdate = date('Y-m-d H:i',$info['cdate']);
+        $operdate = date('Y-m-d H:i',$info['operdate']);
+        if(!$operdate){
+            $operdate = '-';
+        }
+        $html['name'] = $info['order_num'].'<br />'.$cdate.'<br />'.$operdate;
+        $html['money'] = $info['ycash'].'<br />'.$info['cash'].'<br />'.$info['yue'];
+        return $html;
+    }
 }