diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 5971cea86..12461b49e 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -47,7 +47,71 @@ class CompanyRelationController extends AdminController //生效列表 public function index() { - + $params = I('get.'); + $page = $params['p'] ? intval($params['p']) : 1; + $row = $params['row'] ? intval($params['row']) : 10; + $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']}')"; + } + if(isset($params['company_id'])){ + $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; + } + if(isset($params['settlement_type'])){ + $where['settlement_type'] = $params['settlement_type']; + } + if(isset($params['invoice_type'])){ + $where['invoice_type'] = $params['invoice_type']; + } + if(isset($params['is_payment'])){ + $where['is_payment'] = $params['is_payment']; + } + + $this->checkListOrCountAuthRestMap($where);//导出权限 + $dbres = $this->DBModel->where($where)->order("id desc");; + if(isset($params['export'])){ + $dbres = $dbres->select(); + }else{ + $dbres = $dbres->page($page, $row)->select(); + } + foreach($dbres as $k=>&$v){ + $v['settlement_type'] =$this->SettlementType[$v['settlement_type']]; + $v['first_company_type'] =$this->CompanyType[$v['first_company_type']]; + $v['second_company_type'] =$this->CompanyType[$v['second_company_type']]; + $v['invoice_type'] =$this->InvoiceType[$v['invoice_type']]; + $v['is_payment'] =$this->IsPayment[$v['is_payment']]; + $v['collection'] =$this->Collection[$v['collection']]; + } + + 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"=>"收款方" + )); + } + + $count = $this->DBModel->field("count(id) count")->where($where)->find()['count']; + $this->assign('data', $dbres); + $page = set_pagination($count, $row); + if($page) { + $this->assign('_page', $page); + } + $this->assign('Status',$this->Status); + $this->assign('SettlementType',$this->SettlementType); + $this->assign('CompanyType',$this->CompanyType); + $this->assign('InvoiceType',$this->InvoiceType); + $this->assign('IsPayment',$this->IsPayment); + $this->display(); } //审核列表 public function lists() @@ -343,7 +407,17 @@ class CompanyRelationController extends AdminController } public function delRelation() { - + if(!isset($_REQUEST['id'])){ + $this->error('参数错误'); + } + $id = $_REQUEST['id']; + $res = $this->DBlogModel->where("id='{$id}'")->delete(); + if($res !== false){ + addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"删除成功","code"=>1,"url"=>U("lists")]); + }else{ + $this->error('删除错误'); + } } public function getCompanyList($type) { diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index b4d48f323..4b18a5d45 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -37,6 +37,9 @@ .butnbox .butnlist .butn {display:inline-block;width:120px;height:28px;line-height:28px;text-align:center;color:#FFF;background:#3C95C8;border-radius:3px;} .butnbox .butnlist .butn.last {background:#009900;} .butnbox .butnlist .butn~.butn {margin-left:20px;} + .butnbox a{ + cursor:pointer + } .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;} .layui-layer-title { text-align: center; @@ -45,64 +48,70 @@ font-weight: 600; font-size: 18px; } + .data_list table td{ + line-height: 1.5; + }
-

推广游戏分成管理

+
+ 生效列表 + 审核列表 +
+

公司绑定生效列表

-
+
+ +
+
+ +
+
- + + +
-
- + + +
-
搜索
-
-
- - {$vo} - -
-
-
@@ -110,23 +119,15 @@ - - - - 公司名称 - 内外团 + 甲方公司 + 甲方公司类型 + 乙方公司 + 乙方公司类型 结算周期 - 游戏类型 - 原游戏名称 - 现游戏名称 - 生效时间 - 原比例 - 申请比例 - 创建记录 - 市场部审批 - 管理员审批 - 备注 - 操作 + 开票类型 + 开票内容 + 打款流程 + 收款方 @@ -139,65 +140,15 @@ - - - - {$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.create} -
- - - - -
- {$data.market} -
- -
- {$data.market} -
- - - - - -
- {$data.admin} -
- -
- {$data.admin} -
- - - - {$data.remark} - - - - {$vo} - - - + {$data.invoice_type} + {$data.invoice_content} + {$data.is_payment} + {$data.collection} @@ -213,20 +164,7 @@ {$_page|default=''}
- -
-
-
    -
  1. -
    - 备注: - -
    -
    拒绝
     -
    2. -
-
-
+ @@ -260,98 +198,48 @@ $(function(){ $("#search").click(); } }); - $(".editRatio").on("click",function(){ - var id = $(this).data("id"); - var url = "{:U('editRatio')}"+"&id="+id; - window.location.href = url; - }) - $(".delRatio").on("click",function(){ - var id = $(this).data("id"); - var url = "{:U('delRatio')}"+"&id="+id; - layer.confirm('删除后将无法恢复，请慎重选择', { - closeBtn:0, - title:false, - btn: ['取消','删除'] //按钮 - }, function(index){ - layer.close(index); - }, function(){ - $.get(url,function(data){ - if(data.code == 1){ - layer.msg(''+data.msg+'',{time: 1000},function(){ - window.location.reload(); - }); - - }else{ - layer.msg(data.msg,{icon: 2}); - } - }); - }); - }) - - $("#marketAgree,#marketRefuse,#adminAgree").on("click",function(){ - var id = $(this).attr("id"); - if(id == "marketAgree"){ - var opname = "市场部审批通过"; - var opurl = "{:U('marketAgree')}"; - var opst ="[未进行审批]"; - var status = 0; - }else if(id=="marketRefuse"){ - var opname = "市场部审批拒绝"; - var opurl = "{:U('marketRefuse')}"; - var opst ="[未进行审批]"; - var status = 0; - }else if(id=="adminAgree"){ - var opname = "管理员审批通过"; - var opurl = "{:U('adminAgree')}"; - var opst ="[市场部审批通过]"; - var status = 1; - }else if(id=="adminRefuse"){ - var opname = "管理员审批拒绝"; - var opurl = "{:U('adminRefuse')}"; - var opst ="[市场部审批通过]"; - var status = 1; - } - - var flag = false; - var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if($(elem).data("status") != status){ - flag = true; - }else{ - return $(elem).val(); - } - }).get().join(","); - if(text == ''){ - layer.msg("" + '无需要'+opname+'的申请,仅'+opst+'状态可以进行'+opname+""); - return; - } - if(flag){ - layer.confirm(opname+"仅会对"+opst+"的申请进行处理，选择中包含其他的状态的申请将被忽略，点击取消停止操作",{title:false}, function(index){ - _doAgreeApply(); - layer.close(index); - }); - }else{ - _doAgreeApply(); - } - function _doAgreeApply(){ - //执行 - $.ajax({ - type: "POST", - url: opurl, - dataType: 'json', - async: false, - data: {ids:text}, - success:function(data){ - if(data.status==1){ - layer.msg("" + data.info + ""); - setTimeout(function(){ - window.location.reload(); - },1500); - } + var company_id = "{$_GET['company_id']??0}"; + + $("#company_type").on("change",function(){ + var type = $(this).find("option:selected").val(); + var typename=setTypeName(type); + var url = "{:U('getCompanyList')}"+"&type="+type; + $.get(url,function(data){ + var company = data.info; + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id){ + companystr += "" + }else{ + companystr += "" } - }); - } + } + $("#company_id").html(companystr); + $("#company_id").select2(); + }) }) - + $("#company_type").change(); + + function setTypeName(type) { + var typename = ''; + switch (type) { + case '': + typename ="请先选择公司类型"; + break; + case '0': + typename = "请选择已方公司"; + break; + case "1": + typename = "请选择上游CP公司"; + break; + case "2": + typename ="请选择联运下游渠道公司";; + break; + default: + break; + } + return typename; + } })