新增审核列表导出

Application/Admin/Controller/CompanyRelationController.class.php

@@ -78,7 +78,8 @@ class CompanyRelationController extends AdminController
         if(isset($params['status'])){
             $where['status'] = $params['status'];
         }
-        $dbres = $this->DBlogModel->where($where);
+        $this->checkListOrCountAuthRestMap($where);//导出权限
+        $dbres = $this->DBlogModel->where($where)->order("FIELD(status,0,1,-1,-2,2),id desc");;
         if(isset($params['export'])){
             $dbres = $dbres->select();
         }else{
@@ -123,6 +124,28 @@ class CompanyRelationController extends AdminController
             $v['oplist'] = $this->OpAuth($v);
 
         }
+
+        if(isset($_REQUEST['export'])){
+            $GetData = $_GET;
+            unset($GetData['export']);
+            addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]);
+            data2csv($dbres,'公司绑定审核列表',array(
+                "first_company_name"=>"甲方公司类型",
+                "first_company_type"=>"甲方公司",
+                "second_company_name"=>"乙方公司",
+                "second_company_type"=>"乙方公司类型",
+                "settlement_type"=>"结算周期",
+                "invoice_type"=>"开票类型",
+                "invoice_content"=>"开票内容",
+                "is_payment"=>"打款流程",
+                "collection"=>"收款方",
+                "create"=>"创建记录",
+                "market"=>"市场部审批",
+                "admin"=>"管理员审批",
+                "remark"=>"备注"
+            ));
+        }
+
         $count = $this->DBlogModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
         $page = set_pagination($count, $row);
@@ -237,7 +260,7 @@ class CompanyRelationController extends AdminController
     {
         $addurl = U("addRelation");
         $mentBtn = [
-            "addRelation"=>"<a class='butn' href='{$addurl}'>新增推广游戏分成</a>",
+            "addRelation"=>"<a class='butn' href='{$addurl}'>新增公司绑定</a>",
             "marketAgree"=>"<a class='butn' id='marketAgree'>市场部审批通过</a>",
             "marketRefuse"=>"<a class='butn' id='marketRefuse' style='background-color: red;'>市场部审核拒绝</a>",
             "adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>",
@@ -268,7 +291,7 @@ class CompanyRelationController extends AdminController
         if($info['status'] == 2){
             $optist = [];
         }else{
-            $optist = ["editRatio","delRatio"];
+            $optist = ["editRelation","delRelation"];
         }
         //
         $resarr = [];

Application/Admin/View/CompanyRelation/lists.html

@@ -45,6 +45,9 @@
             font-weight: 600;
             font-size: 18px;
         }
+        .data_list table td{
+            line-height: 1.5;
+        }
     </style>
 
     <div class="cf top_nav_list">
@@ -139,15 +142,15 @@
                     <th>
                         <input class="check-all" type="checkbox">
                     </th>
-                    <th>公司名称</th>
-                    <th>内外团</th>
+                    <th>甲方公司</th>
+                    <th>甲方公司类型</th>
+                    <th>乙方公司</th>
+                    <th>乙方公司类型</th>
                     <th>结算周期</th>
-                    <th>游戏类型</th>
-                    <th>原游戏名称</th>
-                    <th>现游戏名称</th>
-                    <th>生效时间</th>
-                    <th>原比例</th>
-                    <th>申请比例</th>
+                    <th>开票类型</th>
+                    <th>开票内容</th>
+                    <th>打款流程</th>
+                    <th>收款方</th>
                     <th>创建记录</th>
                     <th>市场部审批</th>
                     <th>管理员审批</th>
@@ -168,31 +171,21 @@
                             <td>
                                 <input class="ids" type="checkbox" data-status="{$data.status}" value="{$data['id']}" name="ids[]" >
                             </td>
-                            <td>{$data.company_name}</td>
-                            <td>{$data.company_belong}</td>
+                            <td>{$data.first_company_name}</td>
+                            <td>{$data.first_company_type}</td>
+                            <td>{$data.second_company_name}</td>
+                            <td>{$data.second_company_type}</td>
                             <td>{$data.settlement_type}</td>
-                            <td>{$data.game_type_name}</td>
-                            <td>{$data.original_package_name}</td>
-                            <td>{$data.relation_game_name}</td>
-                            <td>{$data.valid}</td>
-                            <td style="line-height: 16px;text-indent: 0;">
-                                <div style="text-align: left;width: 90%;margin-left: 5%;margin-top: 10px;margin-bottom: 10px;">
-                                    {$data.last_turnover_ratio_str}
-                                </div>
-                            </td>
-                            <td style="line-height: 16px;text-indent: 0;">
-                                <div style="text-align: left;width: 90%;margin-left: 5%;margin-top: 10px;margin-bottom: 10px;">
-                                    {$data.turnover_ratio_str}
-                                </div>
-                            </td>
-
+                            <td>{$data.invoice_type}</td>
+                            <td>{$data.invoice_content}</td>
+                            <td>{$data.is_payment}</td>
+                            <td>{$data.collection}</td>
                             <td>
                                 <div style="line-height: 2;">
                                     {$data.create}
                                 </div>
                             </td>
                             <td>
-
                                 <if condition="$data.status eq -1 ">
                                     <div style="line-height: 2;color: red;">
                                         {$data.market}
@@ -203,7 +196,6 @@
                                     </div>
                                 </if>
                             </td>
-
                             <td>
                                 <if condition="$data.status eq -2 ">
                                     <div style="line-height: 2;color: red;">