edit

service/agent/database/soft_cash.php

@@ -32,24 +32,36 @@ $role = function()
     return $array;
 };
 
+# 权限设置 1是软件服务费 2是渠道SAAS账户
+$search_auth = Dever::input('search_option_dever_auth', 1);
+
 $insert = false;
 $col = Dever::input('col');
-if (Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'editnew', '新增')) {
-	$insert = true;
-}
+
 $button = array();
 $excel = false;
-if(Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'editSoftcash', '数据导出')){
+
+$list_button = array();
+if ($search_auth == 1) {
+    if (Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'editnew', '新增')) {
+        $insert = true;
+    }
+
+    if(Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'editSoftcash', '数据导出')){
         $excel[] = array('数据导出','软件服务费', 'agent/lib/soft_cash.out_soft_cash');
     }
-    $list_button = array();
+
     $list_button['list'] = array('查看详情', '"member_prize&project=agent&id={id}&page_type=1&[refer]"');
-$list_button['oper'] = array('删除订单', '"agent/lib/soft_cash.setOrderStatus?id={id}&value=4"', '{status} == 4');
+    $list_button['oper'] = array('删除订单', '"agent/lib/soft_cash.setOrderStatus?id={id}&value=4"', '{status} == 4');
+}
+    
 $admin = Dever::load('manage/auth.info');
 $admin_auth = false;
 if ($admin && $admin['role'] == 24){
     $admin_auth = $admin['role'];
 }
+
+
 return array
 (
     # 表名
@@ -87,7 +99,7 @@ return array
         'mid'      => array
         (
             'type'      => 'int-11',
-            'name'      => '代理商姓名/手机号',
+            'name'      => $search_auth == 2 ? '姓名/手机号' : '代理商姓名/手机号',
             'default'   => '-1',
             'desc'      => '代理商',
             'match'     => 'is_string',
@@ -99,8 +111,9 @@ return array
                 'result' => 'id',
                 'search' => 'mid',
             ),
-            'list'      => $admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
-            'list_order' => 2,
+            'list'      => $search_auth == 2 ? 'Dever::load("agent/member-one#name", {mid})' : ($admin_auth ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true,true)' : 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)'),
+            'list_name' => $search_auth == 2 ? '姓名' : '代理商信息',
+            'list_order' => $search_auth == 2 ? 1 : 2,
         ),
          'mobile'      => array
         (
@@ -113,7 +126,9 @@ return array
             # 绑定js脚本，更新时使用，第一个参数是执行的方式，第二个参数执行的方法，第三个参数是传值。
             'bind'        => array('onblur', 'loading', array('url' => Dever::url("lib/soft_cash.search", 'agent'))),
             //'search'    => 'fulltext',
-            //'list'      => true,
+            'list_name' => '手机号',
+            'list'      => $search_auth == 2 ? 'Dever::load("agent/member-one#mobile", {mid})' : false,
+            'list_order' => 2,
         ),
      
        'order_num'      => array
@@ -126,7 +141,7 @@ return array
             // 'update'    => 'text',
             //'search'    => 'fulltext',
             'list_name' => '订单号<br />购买时间<br/>添加时间',
-            'list'      => 'Dever::load("agent/lib/soft_cash.soft_show#num",{id})',
+            'list'      => $search_auth == 2 ? false : 'Dever::load("agent/lib/soft_cash.soft_show#num",{id})',
             'list_order' => 1,
         ),
 
@@ -140,7 +155,7 @@ return array
             // 'search'    => 'select',
             // 'update'    => 'select',
             'option'    => $role,
-            'list'      => true,
+            'list'      => $search_auth == 2 ? false : true,
         ),
 
         'agreement_id'      => array
@@ -161,7 +176,9 @@ return array
             'desc'      => '费用',
             'match'     => 'option',
             'update'    => 'text',
+            'list_name' => $search_auth == 2 ? '费用' : '软件服务费用',
             'list'      => true,
+
         ),
 
         'price'      => array
@@ -172,7 +189,8 @@ return array
             'desc'      => '原始期权价值',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => true,
+            'list_name' => $search_auth == 2 ? '已有用户数' : '原始期权价值',
+            'list'      => 'Dever::load("agent/lib/member.getUserNum", {mid})',
         ),
 
         'pic'       => array
@@ -185,6 +203,8 @@ return array
             'update'    => 'images',
             'key'       => '1',
             // 'place'     => '759*562',
+            'list_name' => $search_auth == 2 ? '开户日期' : '支付凭证',
+            'list'      => $search_auth == 2 ? '{buy_date} ? date("Y-m-d H:i", {buy_date}) : "-"' : false,
         ),
 
         'status'        => array
@@ -196,11 +216,12 @@ return array
             'match'     => 'is_numeric',
             // 'update'    => 'radio',
             'option'    => $status,
-            'search'    => 'select',
-            'list_name' =>'订单状态<br/>合同签署状态<br/>终审时间<br>签署时间',
-            'list'      => 'Dever::load("agent/lib/soft_cash.list",{id})',
-
+            'search'    => $search_auth == 2 ? false : 'select',
+            'list_name' => $search_auth == 2 ? '状态' : '订单状态',
+            //'list'      => $search_auth == 2 ? true : false,
+            'list_order' => 100,
         ),
+
         'audit'        => array
         (
             'type'      => 'int-11',
@@ -212,6 +233,11 @@ return array
             'option'    => $manage_audit,
             'mul'       => true,
             'control'   => 'audit',
+
+            'list_name' => $search_auth == 2 ? '签署日期' : '订单状态<br/>合同签署状态<br/>终审时间<br>签署时间',
+            'list'      => $search_auth == 2 ? '{fdate} ? date("Y-m-d H:i", {fdate}) : "-"' : 'Dever::load("agent/lib/soft_cash.list",{id})',
+
+            
         ),
 
         'audit_desc'      => array
@@ -230,13 +256,15 @@ return array
         'type'        => array
         (
             'type'      => 'tinyint-1',
-            'name'      => '合同签署状态',
+            'name'      => '签署状态',
             'default'   => '1',
             'desc'      => '合同签署状态',
             'match'     => 'is_numeric',
             // 'update'    => 'radio',
             'option'    => $type,
             'search'    => 'select',
+            'list_name' => $search_auth == 2 ? '状态' : '签署状态',
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'admin_desc'      => array
@@ -258,7 +286,8 @@ return array
             'desc'      => '',
             'match'     => 'is_numeric',
             'update'    => 'day',
-            'search'    => 'date',
+            //'search'    => $search_auth == 2 ? 'order' : 'date',
+            //'order'     => $search_auth == 2 ? 'desc' : false,
             'callback'  => 'maketime',
             // 'list'        => '{buy_date} > 0 ? date("Y-m-d H:i", {buy_date}) : "无"',
         ),
@@ -269,7 +298,7 @@ return array
             'name'      => '终审时间',
             'default'   => '',
             'match'     => 'is_numeric',
-            'search'    => 'date',
+            'search'    => $search_auth == 2 ? false : 'date',
             'desc'      => '',
             // 'list'      => 'date("Y-m-d H:i:s", {zdate})',
         ),
@@ -285,6 +314,15 @@ return array
             // 'list'      => 'date("Y-m-d H:i:s", {zdate})',
         ),
 
+        'dever_auth'      => array
+        (
+            'name'      => '权限查看',
+            'default'   => '',
+            'desc'      => '权限查看',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

service/agent/lib/Member.php

@@ -6,6 +6,11 @@ use Dever;
 
 class Member
 {
+    public function getUserNum($id)
+    {
+        return Dever::load("invite/api")->getChildNum($id, false);
+    }
+
     public function getOne($id, $table = 'agent/member', $area = false, $admin_auth = false)
     {
         if ($id < 0) {