优化下游个人汇总查看

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -233,7 +233,6 @@ class CompanyStatementPoolController extends ThinkController
     }
     //个人汇总结算查看
     public function viewPuPool(&$infolist,$is_export){
-        // dd($infolist);
         $line = 1;
         $count = [];
         //获取对接人
@@ -242,6 +241,13 @@ class CompanyStatementPoolController extends ThinkController
             $v['company_info'] = json_decode($v['company_info'],true);
             $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
             $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
+            if( isset($v['verify_status'])){
+                if( $v['verify_status'] ==2 ){
+                    $v['is_payment'] = 2; //不打款
+                }else{
+                    $v['is_payment'] = 1;
+                }
+            }
             $cline = $line+1;
             if($is_export){
                 $v['sum_money_exp'] = "=";

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -111,19 +111,14 @@
                         <th>奖励</th>
                         <th>罚款</th>
                         <th>结算金额</th>
-                        <if condition="$is_payment eq 2">
-                            <th>开户名</th>
-                            <th>银行卡号</th>
-                            <th>开户支行</th>
-                            <th>帐户类型</th>
-                        </if>
-                        <if condition="$is_payment eq 1">
-                            <th>支付宝真实姓名</th>
-                            <th>支付宝账号</th>
-                        </if>
 
-                        <th>备注</th>
+                        <th>户名</th>
+                        <th>帐号</th>
+                        <th>开户行</th>
+                        <th>是否支付宝打款</th>
                         <th>是否结算</th>
+                        <th>备注</th>
+
                         <if condition="!$is_export">
                             <th>操作</th>
                         </if>
@@ -157,20 +152,23 @@
                             <td>{$com['statement_info'][0]['fine']}</td>
                             <td>{$com['statement_info'][0]['sum_money']}</td>
 
-                            <if condition="$is_payment eq 2">
+                            <if condition="$com['is_payment'] eq 2">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
                                 <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
                                 <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
-                                <td rowspan="{$com.statement_count}"></td>
                             </if>
 
-                            <if condition="$is_payment eq 1">
+                            <if condition="$com['is_payment'] eq 1">
                                 <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
                                 <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
+                                <td rowspan="{$com.statement_count}"></td>
                             </if>
 
-                            <td rowspan="{$com.statement_count}">{$com.remark}</td>
+                            
+
+                            <td rowspan="{$com.statement_count}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>
                             <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
+                            <td rowspan="{$com.statement_count}">{$com.remark}</td>
                             <if condition="!$is_export">
                                 <td rowspan="{$com.statement_count}">
                                     <if condition="($com['st'] eq 1 ) AND ($pool_status lt 1)">
@@ -215,16 +213,10 @@
                         <td></td>
                         <td></td>
                         <td>{$count.sum_money|default=0}</td>
-                        <if condition="$is_payment eq 2">
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                        </if>
-                        <if condition="$is_payment eq 1">
-                            <td></td>
-                            <td></td>
-                        </if>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                         <td></td>
                         <td></td>
                         <if condition="!$is_export">