edit

tool/stats/lib/Manage.php

@@ -362,11 +362,13 @@ Class Manage
 		} 
 		$where['t_1.state'] = 't_1.state=1';
 		$header = array('权益名称','会员等级','姓名','手机号','卡号','类型','数量','单件价值','总价值','已兑换价值','已使用价值','未兑换价值','未使用价值','备注','获取方式','获取时间','代理商注册时间','礼品卡有效期');
+		$body = array();
 		if ($where) {
 			$where = implode(' and ', $where);
 			$data = Dever::db('agent/member_goods')->fetchAll("select t_1.*,t_2.id as aid from churen_agent_member_goods as t_1 left join churen_agent_member as t_2 on t_1.mid = t_2.id where " . $where);
 			// $data = Dever::db('agent/member_goods')->getJoinAll($where);
 			// echo Dever::sql();die;
+			// print_R($data);die;
 			if ($data) {
 				foreach ($data as $k => $v) {
 					$role_name = '';
@@ -432,10 +434,11 @@ Class Manage
 		            );
 		            $body[] = $d;
 				}
-				$file = '代理商权益';
-        		return Dever::excelExport($body, $header, $file);
-			}
+				
+			} 
 		}
+		$file = '代理商权益';
+        return Dever::excelExport($body, $header, $file);
 	}
 	#代理商权益发放使用兑换明细
 	public function mingxi_api()
@@ -532,6 +535,12 @@ Class Manage
 	            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($v['mid']);
 	            if ($dh_order_ps) {
 	            	$type = '兑换权益';
+	            	foreach ($dh_order_ps as $k =>$v) {
+	            		$dh_order = Deverr::db('agent/dh_order_ps')->find($v['order_id']);
+	            		if ($dh_order && isset($dh_order['info']) && $dh_order['info']){
+	            			$desc = $dh_order['info'];
+	            		}
+	            	}
 	            }
 	            if ($where['types'] == 2) {
 	            	if (!$dh_order_ps) {
@@ -629,10 +638,11 @@ Class Manage
                 );
                	$body[] = $d;
 			}
-			$file = '代理商权益明细';
-				// Dever::input('excel_name');
-        	return Dever::excelExport($body, $header, $file);
+			
 		}
+		$file = '代理商权益明细';
+				// Dever::input('excel_name');
+        return Dever::excelExport($body, $header, $file);
 	}
 	public function common($sell_order)
 	{

tool/work/database/info.php

@@ -414,7 +414,16 @@ return array
             'update'    => 'hidden',
             'insert'    => true,
             'value'     => $admin_id,
-            // 'list'      => 'Dever::load("active/lib/manage.active#admin_name",{id})',
+            'search'    => 
+            // 'Dever::load("work/lib/manage.getUSer#chuangjian",{id})',
+            array
+            (
+                'api' => 'manage/admin-getSearch',
+                'col' => 'col',
+                'result' => 'id',
+                'search' => 'audit_admin',
+            ),
+            'list'      => 'Dever::load("work/lib/manage.getUSer#chuangjian",{id})',
         ),
 
          'dever_auth'      => array

tool/work/lib/Manage.php

@@ -212,6 +212,16 @@ Class Manage
 				$question = Dever::db('work/question')->find($cate_id[1]);
 				$question_name = $question['name'];
 			}
+			if ($info['audit_admin']) {
+				$audit = Dever::db('manage/admin')->find($info['audit_admin']);
+				if ($audit) {
+					$admin['group'] = explode(',',$audit['group']);
+			        foreach ($admin['group'] as $k => $v) {
+			            $group = Dever::db('manage/group')->find(array('company_id'=>$info['company_id'],'id'=>$v));
+			        }
+					$html['chuangjian'] = $group['name'].' / ' .$audit['username'];
+				}
+			}
 			$html['cate_name'] = $cate_name.'<br/>'.$question_name;
 				return $html;
 			} else {