优化下游个人汇总样式

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -1165,6 +1165,7 @@ class CompanyStatementSetController extends Controller {
 			$company_info = [
 				'account'=>$v['account'],
 				"company_relation_str"=>$v['company_relation_str'],
+				"company_belong_str"=>$v['company_belong_str'],
 				"company_type_str"=>$v['company_type_str'],
 				"nickname"=>$v['nickname'],
 				"payee_name"=>$v['payee_name'],
@@ -1321,7 +1322,8 @@ class CompanyStatementSetController extends Controller {
 				->where("pc.id = {$company_id}")
 				->find();
 		$company = array_merge($company_info,$pl);
-		$company['company_relation_str'] =getCompanyBlong($company['company_belong']).getCompanyRelation($company['company_relation']);
+		$company['company_relation_str'] =getCompanyRelation($company['company_relation']);
+		$company['company_belong_str'] =getCompanyBlong($company['company_belong']);
 		$company['company_type_str'] = "个人";
 		return $company;
 		

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -102,7 +102,10 @@
                         <th>序号</th>
                         <th>下游名称</th>
                         <th>会长账号</th>
-                        <th>下游类型</th>
+
+                        <th>内外团</th>
+                        <th>开发类型</th>
+
                         <th>市场专员</th>
                         <th>下游性质</th>
                         <th>产品</th>
@@ -143,7 +146,9 @@
                                 <td>-</td>
                             </notempty>
                             
+                            <td rowspan="{$com.row}">{$com.company_info.company_belong_str}</td>
                             <td rowspan="{$com.row}">{$com.company_info.company_relation_str}</td>
+
                             <td rowspan="{$com.row}">{$com.company_info.nickname}</td>
                             <td rowspan="{$com.row}">{$com.company_info.company_type_str}</td>