edit

tool/clue/database/follow.php

@@ -98,7 +98,7 @@ return array
             'match'     => 'is_numeric',
             // 'search'    => 'date',
             'desc'      => '',
-            'update'    => 'day',
+            'update'    => 'date',
             'callback'  => 'maketime',
         ),
 

tool/clue/database/info.php

@@ -31,6 +31,19 @@ $status = function()
     }
     return $array;
 };
+// $selepeople = function()
+// {
+//     $array = array();
+//     $data = Dever::db('clue/salepeople')->state();
+//     if($data)
+//     {
+//     	foreach ($data as $k => $v) {
+//     		$data[$k]['name'] = $v['group'];
+//     	}
+//         $array += $data;
+//     }
+//     return $array;
+// };
 $sex = array
 (
     1 => '未知',
@@ -58,8 +71,25 @@ if ($admin) {
 }
 $search_auth = Dever::input('search_option_dever_auth', 1);
 if ($search_auth ==2) {
-	$audit_admin = Dever::setInput('search_option_follow_admin_id', $admin_id);
-	// print_R($audit_admin);die;
+	$company = Dever::load('manage/company.get');
+	$admin = Dever::db('manage/admin')->find($admin_id);
+	if ($admin) {
+		$admin['group'] = explode(',',$admin['group']);
+		foreach ($admin['group'] as $k =>$v) {
+			$group = Dever::db('manage/group')->find(array('company_id'=>$company,'id'=>$v));
+		}
+		if ($group) {
+			$work = Dever::db('work/branch')->find(array('group_id'=>$group['id']));
+			if ($work) {
+				$work['group'] = explode(',',$work['group']);
+				if (isset($work['group'][1]) && $work['group'][1] && $work['group'][1] == $admin_id) {
+					$audit_admin = Dever::setInput('search_option_follow_group_id', $group['id']);
+				} else {
+					$audit_admin = Dever::setInput('search_option_follow_admin_id', $admin_id);
+				}
+			}
+		}
+	}
 }
 $list_button = array();
 $list_button['location'] = array('查看详情',Dever::url('lib/info.show','clue'));
@@ -373,6 +403,7 @@ return array
             // 'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
+            // $salepeople,
             'list_name' => '跟进人',
             'list'      => 'Dever::load("clue/lib/info.getNum#people",{id})',
         ),
@@ -568,6 +599,7 @@ return array
                 'start_cdate'=>array('yes-cdate','>='),
                 'end_cdate' => array('yes-cdate','<='),
                 'follow_admin_id' => 'yes',
+                'follow_grouop_id' => 'yes',
                 // 'area' => array('yes', 'like'),
                 'start_day' => array('yes-day', '>='),
                 'end_day' => array('yes-day', '<='),

tool/clue/lib/Info.php

@@ -33,7 +33,7 @@ Class Info
 		$follow = Dever::db('clue/follow')->find(array('info_id'=>$id,'status'=>1));
 		if ($follow){
 			if ($follow['xdate']) {
-				$html['xdate'] = date('Y.m.d',$follow['xdate']);
+				$html['xdate'] = date('Y.m.d H:i',$follow['xdate']);
 			}
 		}
 		if ($info['num'] && $info['num'] > 0) {
@@ -264,7 +264,7 @@ Class Info
 			}
 			$data['follow'][$k]['type_name'] = Dever::status($config_type,$v['type']);
 			$data['follow'][$k]['cdate'] = date('Y-m-d H:i:s',$v['cdate']);
-			$data['follow'][$k]['xdate'] = date('Y-m-d',$v['xdate']);
+			$data['follow'][$k]['xdate'] = date('Y-m-d H:i',$v['xdate']);
 			$data['follow'][$k]['pic'] = explode(',',$v['pic']);
 			if (!$v['desc']) {
 				unset($data['follow'][$k]);