From f20cfde7c7c550d2aedde4c7bb6a8f2c7f7cf3b1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Sat, 23 May 2020 20:12:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 31 +++++++++++-- .../Admin/View/CompanyRelation/lists.html | 46 ++++++++----------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 5aa805cd2..713ab696d 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -58,7 +58,7 @@ class CompanyRelationController extends AdminController //权限分配 if(!IS_ROOT){ $this->OpAuthList= getModuleControllerAuth(); - } + } $where['_string'] = '1 = 1'; if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; @@ -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"=>"新增推广游戏分成", + "addRelation"=>"新增公司绑定", "marketAgree"=>"市场部审批通过", "marketRefuse"=>"市场部审核拒绝", "adminAgree"=>"管理员审核通过", @@ -268,7 +291,7 @@ class CompanyRelationController extends AdminController if($info['status'] == 2){ $optist = []; }else{ - $optist = ["editRatio","delRatio"]; + $optist = ["editRelation","delRelation"]; } // $resarr = []; diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index c3ad7dbfd..33688d0d2 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -45,6 +45,9 @@ font-weight: 600; font-size: 18px; } + .data_list table td{ + line-height: 1.5; + }
@@ -139,15 +142,15 @@ - 公司名称 - 内外团 + 甲方公司 + 甲方公司类型 + 乙方公司 + 乙方公司类型 结算周期 - 游戏类型 - 原游戏名称 - 现游戏名称 - 生效时间 - 原比例 - 申请比例 + 开票类型 + 开票内容 + 打款流程 + 收款方 创建记录 市场部审批 管理员审批 @@ -168,31 +171,21 @@ - {$data.company_name} - {$data.company_belong} + {$data.first_company_name} + {$data.first_company_type} + {$data.second_company_name} + {$data.second_company_type} {$data.settlement_type} - {$data.game_type_name} - {$data.original_package_name} - {$data.relation_game_name} - {$data.valid} - -
- {$data.last_turnover_ratio_str} -
- - -
- {$data.turnover_ratio_str} -
- - + {$data.invoice_type} + {$data.invoice_content} + {$data.is_payment} + {$data.collection}
{$data.create}
-
{$data.market} @@ -203,7 +196,6 @@
-