From d9d55a3bcb9884b3a371f77ece304b9cd1263852 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 16 Jul 2020 16:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E=E4=B8=8B?= =?UTF-8?q?=E6=B8=B8=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteCompanyController.class.php | 357 +++++++++------ .../Admin/View/PromoteCompany/add.html | 424 ++++++++++++++++-- .../Admin/View/PromoteCompany/edit.html | 47 +- .../Admin/View/PromoteCompany/lists.html | 8 +- Data/update.sql | 12 +- 5 files changed, 667 insertions(+), 181 deletions(-) diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index cf4fe869a..092d5b60a 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -59,122 +59,120 @@ class PromoteCompanyController extends ThinkController }else{ $companyres = $companyres->page($page,$row)->select(); } - if(1 == 0){ - //获取公司id - $companyids = implode(',', array_column($companyres, 'id')); - //获取所属会长及其游戏分成 - $promotemap['company_id']=["in",$companyids]; - $promotemap['level'] = 1; - - $promoteres = M("Promote","tab_") - ->field("id,company_id,account,settlement_type") - ->where($promotemap) + //获取公司id + $companyids = implode(',', array_column($companyres, 'id')); + //获取所属会长及其游戏分成 + $promotemap['company_id']=["in",$companyids]; + $promotemap['level'] = 1; + + $promoteres = M("Promote","tab_") + ->field("id,company_id,account,settlement_type") + ->where($promotemap) + ->select(); + //获取会长id + $promoteids = implode(',', array_column($promoteres, 'id')); + //获取游戏比例 + $gameradiores = M("PromoteGameRatio","tab_") + ->alias("pg") + ->field("pg.ratio,pg.relation_game_id,pg.turnover_ratio,pg.game_id,pg.promote_id,ga.relation_game_name,ga.game_type_name") + ->join("tab_game ga ON pg.game_id = ga.id") + ->where(array( + "status"=>1, + "promote_id"=>["in",$promoteids] + )) + ->group("relation_game_id,promote_id") ->select(); - //获取会长id - $promoteids = implode(',', array_column($promoteres, 'id')); - //获取游戏比例 - $gameradiores = M("PromoteGameRatio","tab_") - ->alias("pg") - ->field("pg.ratio,pg.relation_game_id,pg.turnover_ratio,pg.game_id,pg.promote_id,ga.relation_game_name,ga.game_type_name") - ->join("tab_game ga ON pg.game_id = ga.id") - ->where(array( - "status"=>1, - "promote_id"=>["in",$promoteids] - )) - ->group("relation_game_id,promote_id") - ->select(); - //比例数据处理 - $gameradiotemp = array(); - foreach($gameradiores as $k=>$v){ - $turnover_ratio = json_decode($v['turnover_ratio'],true); - $v['turnover_ratio'] = array( - array("ratio"=>$v['ratio']."%","name"=>"默认比例") - ); - - foreach($turnover_ratio as $ke=>$va){ - $t=array("ratio"=>$va["ratio"]."%"); - if(array_key_exists("instanceof",$va)){ - //存在 - if($va['instanceof']=='1'){ - $t['name']="月流水≥".$va['turnover']; - }else{ - $t['name']="月流水＞".$va['turnover']; - } - }else{ - $t['name']="月流水≥".$va['turnover']; - } - $v['turnover_ratio'][]=$t; - } - $v['row'] = count($v['turnover_ratio']); - unset($v["ratio"]); - unset($v["relation_game_id"]); - unset($v["game_id"]); - $gameradiotemp[$v['promote_id']][]=$v; - } - unset($gameradiores); - //会长数据处理 - $promoterestemp=[]; - foreach($promoteres as $k=>$v){ - if(array_key_exists($v['id'],$gameradiotemp)){ + //比例数据处理 + $gameradiotemp = array(); + foreach($gameradiores as $k=>$v){ + $turnover_ratio = json_decode($v['turnover_ratio'],true); + $v['turnover_ratio'] = array( + array("ratio"=>$v['ratio']."%","name"=>"默认比例") + ); + + foreach($turnover_ratio as $ke=>$va){ + $t=array("ratio"=>$va["ratio"]."%"); + if(array_key_exists("instanceof",$va)){ //存在 - $v['list'] = $gameradiotemp[$v['id']]; - foreach($gameradiotemp[$v['id']] as $ke=>$va){ - $v['row'] += $va['row']; + if($va['instanceof']=='1'){ + $t['name']="月流水≥".$va['turnover']; + }else{ + $t['name']="月流水＞".$va['turnover']; } }else{ - $v['list']=[ - ["relation_game_name"=>"--","game_type_name"=>"--", - "turnover_ratio"=>[ - ["name"=>"--","ratio"=>"--"] - ], - "row"=>1 - ] - ]; - $v["row"]=1; + $t['name']="月流水≥".$va['turnover']; } - if($v['settlement_type'] == 1){ - $v['settlement_type']="周结"; - }else{ - $v['settlement_type']="月结"; + $v['turnover_ratio'][]=$t; + } + $v['row'] = count($v['turnover_ratio']); + unset($v["ratio"]); + unset($v["relation_game_id"]); + unset($v["game_id"]); + $gameradiotemp[$v['promote_id']][]=$v; + } + unset($gameradiores); + //会长数据处理 + $promoterestemp=[]; + foreach($promoteres as $k=>$v){ + if(array_key_exists($v['id'],$gameradiotemp)){ + //存在 + $v['list'] = $gameradiotemp[$v['id']]; + foreach($gameradiotemp[$v['id']] as $ke=>$va){ + $v['row'] += $va['row']; } - $promoterestemp[$v['company_id']]["list"][]=$v; + }else{ + $v['list']=[ + ["relation_game_name"=>"--","game_type_name"=>"--", + "turnover_ratio"=>[ + ["name"=>"--","ratio"=>"--"] + ], + "row"=>1 + ] + ]; + $v["row"]=1; + } + if($v['settlement_type'] == 1){ + $v['settlement_type']="周结"; + }else{ + $v['settlement_type']="月结"; } - unset($promoteres); - + $promoterestemp[$v['company_id']]["list"][]=$v; } + unset($promoteres); + //处理公司数据 foreach($companyres as $k=>&$v){ - // if(array_key_exists($v['id'],$promoterestemp)){ - // //存在 - // $v['list'] = $promoterestemp[$v['id']]['list']; - // foreach($promoterestemp[$v['id']] as $ke=>$va){ - // foreach($va as $key=>$val){ - // $v['row'] += $val['row']; - // } + if(array_key_exists($v['id'],$promoterestemp)){ + //存在 + $v['list'] = $promoterestemp[$v['id']]['list']; + foreach($promoterestemp[$v['id']] as $ke=>$va){ + foreach($va as $key=>$val){ + $v['row'] += $val['row']; + } - // } - // $v['can_del'] = 0; - // }else{ - // //空值 - // $v['can_del'] = 1; - // $v['list']=[ - // [ - // "account"=>"--", - // "settlement_type"=>"--", - // 'list'=>[ - // [ - // "relation_game_name"=>"--", - // "game_type_name"=>"--", - // "turnover_ratio"=>[ - // ["name"=>"--","ratio"=>"--"] - // ], - // "row"=>1 - // ] - // ] - // ] - // ]; - // $v['row'] += 1; - // } + } + $v['can_del'] = 0; + }else{ + //空值 + $v['can_del'] = 1; + $v['list']=[ + [ + "account"=>"--", + "settlement_type"=>"--", + 'list'=>[ + [ + "relation_game_name"=>"--", + "game_type_name"=>"--", + "turnover_ratio"=>[ + ["name"=>"--","ratio"=>"--"] + ], + "row"=>1 + ] + ] + ] + ]; + $v['row'] += 1; + } if( $v["contact_begin"] >0 ){ $v["contact_begin"] = date('Y/m/d', $v["contact_begin"]); }else{ @@ -236,34 +234,14 @@ class PromoteCompanyController extends ThinkController public function add() { if ($_POST) { - $company_name = I('post.company_name', ''); - $model = M($this->modelName, 'tab_'); - $map['company_name'] = $company_name; - $res = $model->where($map)->getField('id'); - if ($res) { - $this->ajaxReturn(array( - 'status' => 0, - 'info' => "推广公司已经存在" - )); - } $time = time(); $save = I('post.');//前端已经验证 + $this->checkData($save); $save['create_time'] = $time; - $save['last_up_time'] = $time; - $save['contact_begin']=strtotime($save['contact_begin']); - $save['contact_end']=strtotime($save['contact_end']); - - if(isset($save['resources'])){ - $save['resources'] = json_encode($save['resources'],JSON_UNESCAPED_UNICODE); - } - if(empty($save['contact_phone'])){ - $save['contact_phone'] = 0; - } - $res = $model->add($save); + $save['turnover_ratio'] = $this->setTurnoverRatio($save); + $res = M("promote_company","tab_")->add($save); if ($res) { - - addOperationLog(['op_type'=>0,'key'=>$company_name,'op_name'=>'新增推广公司','url'=>U('PromoteCompany/lists'),'menu'=>'推广员-推广员管理-推广公司管理-新增推广公司']); - + addOperationLog(['op_type'=>0,'key'=>$save['company_name'],'op_name'=>'新增推广公司','url'=>U('PromoteCompany/lists')]); \Think\Log::actionLog('PromoteCompany/add', 'partner', $res); $array=array( "info"=>"添加成功", @@ -715,6 +693,127 @@ WHERE old_change_promote_id in ({$promoteData})"; } } } + // + protected function setTurnoverRatio($params) + { + $save['turnover_ratio'] = []; + if (!empty(array_filter($params['turnover'])) || !empty(array_filter($params['turnover_ratio'])) ) { + if (is_array($params['turnover']) && is_array($params['turnover_ratio']) && is_array($params['instanceof'])) { + foreach ($params['turnover'] as $turnover) { + if (empty($turnover)) { + $this->error('月流水不能为空'); + } + } + foreach ($params['turnover_ratio'] as $turnoverRatio) { + if (empty($turnoverRatio)) { + $this->error('月流水分成比例不能为空'); + } + } + foreach ($params['instanceof'] as $intervalClosedStatus) { + if (!in_array($intervalClosedStatus, [1, 2])) { + $this->error('月流水分符号不能为空'); + } + } + $turnoverCount = count($params['turnover']); + $sortTurnover = $params['turnover']; + sort($sortTurnover); + if ($params['turnover'] != $sortTurnover || $turnoverCount != count(array_unique($params['turnover']))) { + $this->error('月流水必须以正序的方式填写，且必须大于上一个月流水'); + } + $ratio = $params['ratio'] ?? 0; + // if ($params['turnover_ratio'][0] <= $ratio) { + // $this->error('月流水分成比例必须大于默认分成比例'); + // } + $turnoverRatioCount = count($params['turnover_ratio']); + $sortTurnoverRatio = $params['turnover_ratio']; + sort($sortTurnoverRatio); + // if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { + // $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); + // } + + foreach ($params['turnover'] as $key => $turnover) { + $save['turnover_ratio'][] = [ + 'turnover' => bcdiv($turnover, 1, 2), + 'ratio' => bcdiv($params['turnover_ratio'][$key], 1, 2), + 'instanceof' => (isset($params['instanceof'][$key]) ? $params['instanceof'][$key] : 1), + ]; + } + } + } + return json_encode($save['turnover_ratio']); + } + protected function checkData(&$save) + { + $company_name = trim($save["company_name"]); + $status = intval($save['status']); + + if (empty($company_name)) { + $this->error('请输入推广公司名称'); + } + + $model = M("promote_company", 'tab_'); + $map['company_name'] = $company_name; + $res = $model->where($map)->field("id")->find(); + + if ($res) { + if(isset($save['id'])){ + if($save['id'] !=$res['id']){ + $this->error('推广公司已存在'); + } + }else{ + $this->error('推广公司已存在'); + } + } + + if(!empty(I("contact_phone")) && !checkPhone(I('contact_phone'))) { + $this->error('联系电话格式不正确'); + } + if(!empty(I('reg_phone')) && !checkPhone(I('reg_phone'))) { + $this->error('注册电话格式不正确'); + } + if(!empty(I('taxation_rate')) && I('taxation_rate') > 0) { + if(!checkNumber(I('taxation_rate'))){ + $this->error('税费费率格式错误'); + }else{ + $save['taxation_rate'] = ($save['taxation_rate'] ?: 0); + } + }else{ + $save['taxation_rate']=0; + } + if(!empty(I('channel_rate')) && I('channel_rate') > 0) { + if(!checkNumber(I('channel_rate'))){ + $this->error('渠道费率格式不对'); + }else{ + $save['channel_rate'] = ($save['channel_rate'] ?: 0); + } + }else{ + $save['channel_rate']=0; + } + if(!empty(I('fax_ratio')) && I('fax_ratio') > 0) { + if(!checkNumber(I('fax_ratio'))){ + $this->error('开票税点格式不对'); + }else{ + $save['fax_ratio'] = ($save['fax_ratio'] ?: 0); + } + }else{ + $save['fax_ratio']=0; + } + if(!empty(I('server_fee')) && !checkNumber(I('server_fee')) && I("has_server_fee") == 1) { + $this->error('服务器费用格式不对'); + }else{ + if(empty(I('server_fee'))){ + $save['server_fee']=0; + }else{ + $save['server_fee']=I('server_fee'); + } + } + $time =time(); + $save['contact_begin'] = strtotime($save['contact_begin']); + $save['contact_end'] = strtotime($save['contact_end']); + $save['validity_start_time'] = strtotime($save['validity_start_time']); + $save['validity_end_time'] = strtotime($save['validity_end_time']); + $save['last_up_time'] = $time; + } } diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 0d41aa0c8..e3abbc8e0 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -2,6 +2,7 @@ + @@ -42,7 +85,7 @@
-
+
@@ -53,12 +96,28 @@ + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + - + @@ -145,28 +227,24 @@ + - + - + - + - + @@ -175,6 +253,19 @@ + + + + + + + + + @@ -190,23 +281,45 @@ + - + + - - + + + + + + + - + + - + + + + + + + + + + + + + + +
*团体归属: +
+ +
+
对应平台(简称):
合同期限: @@ -74,13 +133,35 @@
结算生效期限: + +  -  +
开票税点: - - % + %
渠道费率： + % +
税费费率: + % +
公司性质: @@ -92,7 +173,7 @@
是否签署合同: @@ -105,6 +186,7 @@
是否展示合同服务协议: @@ -119,22 +201,22 @@
团体归属:开发类型： -
- -
+
联系结算人：联系人：
所在地址：注册地址: - +
银行卡号：注册电话: - +
收款银行：邮寄地址： - +
银行卡号： + +
收款银行： + +
支付宝真实姓名：
开发类型：备注： - +
备注： - + *承担服务费： + + + + +
*合作关系: + + + + + +
*显示状态： @@ -222,27 +335,61 @@
文档管理*市场总监信息展示： -
- 添加 -
+ + + + +
市场总监信息展示：*合作方比例增量:
文档管理 +
+ 添加 +
+
@@ -307,6 +454,25 @@ PROMOTE.juicerFun(); // window.parent.addFile(info); } + $("input[type=radio][name=has_server_fee]").on('change', function (e) { + 　　　　var v = $(this).val(); + if(v == 1){ + $("#server_fee_input").show(); + }else{ + $("#server_fee_input").hide(); + } + 　　}); + $("input[type=radio][name=has_ratio]").on('change', function (e) { + 　　　　var v = $(this).val(); + if(v == 1){ + $("#turnover_ratio").show(); + }else{ + $("#turnover_ratio").hide(); + } + 　　}); + + + $('#contact_begin').datetimepicker({ format: 'yyyy-mm-dd', language: "zh-CN", @@ -334,6 +500,38 @@ return false; }); + $('.time3').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView: "month", + autoclose:true + }).change(function(){ + var start = new Date($(this).val()).getTime(); + var end = new Date($('.time4').val()).getTime(); + + if(isNaN(end)) {return false;} + + if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + + return false; + }); + + $('.time4').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView: "month", + autoclose:true + }).change(function(){ + var end = new Date($(this).val()).getTime(); + var start = new Date($('.time3').val()).getTime(); + + if(isNaN(start)) {return false;} + + if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + + return false; + }); + $(".coin-detail").click(function () { var url = $(this).data('url'); var title = '文档添加'; @@ -347,6 +545,7 @@ }); }); $("#submit").on("click",function(){ + var flag = true; var obj = { "company_name":["required",false,"推广公司名称不允许为空"], "fax_ratio":["number",true,"开票税率必须是数字，如果无此项请填0"], @@ -359,9 +558,31 @@ if(doc.length > 0){ senddata.push({"name":"resources", "value":JSON.stringify(doc)}); } + var hasratio = $("input[type=radio][name=has_ratio]:checked").val(); + if(hasratio == 1){ + $(".error-message").each(function(index,elm){ + var t = $(elm).css("display"); + if(t == 'block' || t == 'inline'){ + flag = false; + layer.msg("请先处理错误的比例配置", {icon: 2}); + return false; + } + }) + $(".turnover_money").each(function(index,elm){ + var t = $(elm).val(); + if(t == ''){ + flag = false; + layer.msg("流水及比例不允许为空,如不需要请删除", {icon: 2}); + return false; + } + }) + } + if(!flag) return false; + + console.log(senddata); //添加 $.ajax({ - url:"{:U('PromoteCompany/add')}", + url:"{:U('add')}", type:"post", data:senddata, dataType:"json", @@ -380,6 +601,121 @@ }); }) + $('.iconfont-btn-add').click(function (e) { + var delBtn = $('.iconfont-btn-del'); + var html = ''; + html += '
'; + html += ''; + html += ''; + html += '
'; + html += ''; + html += ''; + html += '
'; + html += ''; + html += '
'; + html += ''; + html += '%'; + html += ''; + html += '
'; + html += '
'; + + $('.list-ratio').append(html); + // subevn(); + if ($('.list-ratio').children().length > 1 && delBtn.children('i').hasClass('iconfont-unselected')) { + delBtn.children('i').removeClass('iconfont-unselected'); + delBtn.children('i').addClass('iconfont-selected'); + } + + $('.list-ratio').children(':last-child').children('.turnover').children('input').change(function (e) { + turnoverChangeHandle(); + }); + + $('.list-ratio').children(':last-child').children('.turnover-ratio').children('input').change(function (e) { + turnoverRatioChangeHandle(); + }); + }); + + $('.list-ratio').children('.li-ratio').children('.turnover').children('input').change(function (e) { + turnoverChangeHandle(); + }); + + $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').change(function (e) { + turnoverRatioChangeHandle(); + }); + + function turnoverChangeHandle() + { + $('.list-ratio').children('.li-ratio').children('.turnover').children('input').each(function () { + var that = $(this); + var thatLiRatio = that.parent().parent(); + var thatLiRatioIndex = thatLiRatio.index(); + var prevTurnover = 0; + var prev = thatLiRatio.prev().children().children('input'); + var thatTurnover = parseFloat(that.val()); + + if (thatLiRatioIndex > 0) { + prevTurnover = parseFloat(prev.val()); + prevTurnoverHandle(thatTurnover, prevTurnover, that); + } + }); + } + + function turnoverRatioChangeHandle() { + var ratio = parseFloat($('#ratio').val()); + $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').each(function () { + var that = $(this); + var thatLiRatio = that.parent().parent(); + var thatLiRatioIndex = thatLiRatio.index(); + var thatTurnoverRatio = parseFloat(that.val()); + + if (thatLiRatioIndex === 1) { + prevTurnoverRatio = ratio; + prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, true); + } else { + var prev = thatLiRatio.prev().children('.turnover-ratio').children('input'); + var prevTurnoverRatio = parseFloat(prev.val()); + prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that); + } + }); + } + + function prevTurnoverHandle(thatTurnover, prevTurnover, that) + { + if (thatTurnover <= prevTurnover) { + that.parent().children('span').text('月流水必须大于上一个月流水'); + that.parent().children('span').show(); + } else { + that.parent().children('span').hide(); + } + return true; + } + + function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) + { + // if (thatTurnoverRatio <= prevTurnoverRatio) { + // var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + // that.parent().children('.error-message').text(msg); + // that.parent().children('.error-message').show(); + // } else { + // that.parent().children('.error-message').hide(); + // } + return true; + } + + $('.iconfont-btn-del').click(function (e) { + var that = $(this); + + if ($('.list-ratio').children().length > 1) { + $('.list-ratio').children(':last-child').remove(); + if ($('.list-ratio').children().length === 1) { + that.children('i').removeClass('iconfont-selected'); + that.children('i').addClass('iconfont-unselected'); + } + } + }); var PROMOTE = { juicerFun(){ var tpl =$("#doctpl").html(); diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index f9ea0cd0c..328b23598 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -42,7 +42,7 @@
- +
@@ -74,11 +74,25 @@ + + + + + + + + + @@ -149,6 +163,20 @@ + + + + + + + + + + - + @@ -155,7 +155,7 @@ - + @@ -247,7 +247,7 @@ - + diff --git a/Data/update.sql b/Data/update.sql index e228aaffe..b47b2d903 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2095,7 +2095,7 @@ ADD COLUMN `change_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '推广员充 --CP审核 cz ALTER TABLE `tab_partner` -ADD COLUMN `taxation_rate` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '税费费率' AFTER `cooperation_status`; +ADD COLUMN `taxation_rate` decimal(5,3) NOT NULL DEFAULT '0.00' COMMENT '税费费率' AFTER `cooperation_status`; CREATE TABLE `tab_partner_verify` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', @@ -2111,7 +2111,7 @@ CREATE TABLE `tab_partner_verify` ( KEY `verify_status` (`verify_status`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; - +-- 新增推广公司字段及审核 ALTER TABLE `tab_promote_company` ADD COLUMN `validity_start_time` int(11) NOT NULL DEFAULT 0 COMMENT '生效开始时间' AFTER `company_type`, ADD COLUMN `validity_end_time` int(11) NOT NULL DEFAULT 0 COMMENT '生效结算时间' AFTER `validity_start_time`, @@ -2123,4 +2123,12 @@ ADD COLUMN `has_server_fee` tinyint(1) NOT NULL DEFAULT 0 COMMENT '承担服务 ADD COLUMN `server_fee` decimal(10,2) NOT NULL DEFAULT 0.00 COMMENT '服务器费用' AFTER `has_server_fee`, ADD COLUMN `cooperation_status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '合作关系1合作中 0暂停合作' AFTER `server_fee`; +ALTER TABLE `tab_promote_company` +ADD COLUMN `taxation_rate` decimal(5,3) NOT NULL DEFAULT '0' COMMENT '税费费率' AFTER `cooperation_status`; + +ALTER TABLE `tab_promote_company` +ADD COLUMN `channel_rate` decimal(5,2) NOT NULL DEFAULT '0' COMMENT '渠道费率' AFTER `taxation_rate`; + +ALTER TABLE `tab_promote_company` +MODIFY COLUMN `contact_phone` varchar(24) NOT NULL DEFAULT '' COMMENT '联系电话' AFTER `settlement_contact`; \ No newline at end of file
结算生效期限: + +  -  +
开票税点: - % + % +
税费费率: + %
注册地址: + +
注册电话: + +
所在地址： @@ -404,6 +432,21 @@ if(start>=end) {layer.msg('开始时间必须小于结束时间');$("#contact_end").val('');return false;} return false; }); + $('.time3').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView: "month", + autoclose:true + }).change(function(){ + var start = new Date($(this).val()).getTime(); + var end = new Date($('.time4').val()).getTime(); + + if(isNaN(end)) {return false;} + + if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + + return false; + }); $(".coin-detail").click(function () { diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index 104320b5f..a206b3c95 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -130,12 +130,12 @@ 银行账号 是否签署合同 备注合作方分成比例
{$data.company_name}查看查看 {$data.platform_name} {$data.company_type} {$data.company_belong}
汇总:汇总: 累计推广公司数量：{$count}　　会长数量:{$promotecount}