Your Name %!s(int64=2) %!d(string=hai) anos
pai
achega
a2ccc11c07

+ 29 - 5
service/agent/database/member_shop_log.php

@@ -9,6 +9,8 @@ $shop = function()
     }
     return $array;
 };
+# 权限设置 1是归店记录列表、2是归店详细信息
+$search_auth = Dever::input('search_option_dever_auth', 1);
 return array
 (
     # 表名
@@ -48,7 +50,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)': 'Dever::load("bill/lib/manage.guidian",{mid})',
             'list_order' => 1,
         ),
 
@@ -60,7 +62,8 @@ return array
             'desc'      => '店铺名称',
             'match'     => 'is_numeric',
             'option'    => $shop,
-            'list'      => true,
+            'list_name' => $search_auth == 2 ? '角色' : false,
+            'list'      => $search_auth == 1 ? true : 'Dever::load("bill/lib/manage.role",{mid})',
             //'list_order' => 6,
         ),
 
@@ -71,9 +74,30 @@ return array
             'default'   => '',
             'desc'      => '店铺名称',
             'match'     => 'is_numeric',
+            'search'    => 'hidden',
             'option'    => $shop,
-            'list'      => true,
-            //'list_order' => 6,
+            'list_name' => $search_auth == 2 ? '归店业绩' : false,
+            'list'      => $search_auth == 1 ? true : 'Dever::load("bill/lib/manage.yeji",{mid})',
+        ),
+
+        'dever_auth'      => array
+        (
+            'name'      => '类型',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+            
+        ),
+
+        'dever_time'      => array
+        (
+            'name'      => '归店时间',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            // 'search'    => 'hidden',
+            'search'    => $search_auth == 2 ? 'date' : false,
         ),
 
         'state'     => array
@@ -93,7 +117,7 @@ return array
             'desc'      => '',
             # 只有insert时才生效
             'insert'    => true,
-            'search'    => 'date',
+            'search'    => $search_auth == 1 ? 'date' : false,
             'list'      => 'date("Y-m-d", {cdate})',
             'order'     => 'desc',
         ),

+ 7 - 0
service/bill/database/shop_stat.php

@@ -13,6 +13,8 @@ $shop = function()
     }
     return $array;
 };
+$list_button = array();
+$list_button['list1'] = array('查看明细', 'project/database/list&project=agent&table=member_shop_log&menu=agent&search_option_state=1&menu_id=306&search_option_new_shop_id={shop_id}&search_option_dever_auth=2');
 $config = array
 (
     # 表名
@@ -216,6 +218,11 @@ $config = array
         'delete' => false,
         // 'excel' => $excel,
         'button' => $button,
+        'list_button' => $list_button,
+            // (
+
+            //     'new' => array('查看明细', '"lib/manage.guidian?id={id}"', 'bill'),
+            // ),
         
     ),
 

+ 24 - 0
service/bill/lib/Manage.php

@@ -360,4 +360,28 @@ class Manage
         }
         return $html; 
     }
+    public function guidian($mid){
+        $member = Dever::db('agent/member')->find($mid);
+        $area = Dever::load("area/api.string", $member['area']);
+        $data = array();
+        $data = $member['name'].'<br/>'.$member['mobile'].'<br/>'.$area;
+        return $data;
+    }
+    public function role($mid){
+        $member = Dever::db('agent/member')->find($mid);
+        $role = Dever::db('setting/role')->find($member['role']);
+        $data = array();
+        $data = $role['name'];
+        return $data;
+    }
+    public function yeji($mid){
+        $start = Dever::input('search_option_start_dever_time');
+        $end = Dever::input('search_option_dever_time');
+        $where['start'] = $start;
+        $where['end'] = $end;
+        $where['mid'] = $mid;
+        $where['state'] = 1;
+        $money = Dever::db('agent/order')->getCount($where);
+        return $money['total'];
+    }
 }