上游导出修正

master
zhengyongxing 4 years ago
parent 0c4211a951
commit 0631c22c93

@ -2497,7 +2497,7 @@ function getCompanyBlongOther($id = -1)
$data = array(
["id"=>0,'name'=>"无"],
["id"=>1,'name'=>"自主开发"],
["id"=>2,'name'=>"自主开发及维护"],
// ["id"=>2,'name'=>"自主开发及维护"],
["id"=>3,'name'=>"只维护"]
);
if($id > -1){
@ -2812,8 +2812,9 @@ function getPromoteIdsByTopIds($ids)
function getCompanyDevelopTypes()
{
return [
0 => '无',
1 => '自主开发',
2 => '自主开发及维护',
// 2 => '自主开发及维护',
3 => '只维护',
];
}
@ -2821,10 +2822,11 @@ function getCompanyDevelopTypes()
function getCompanyDevelopTypesOther()
{
return [
0 => '无',
1 => '自主开发',
2 => '自主开发及维护',
// 2 => '自主开发及维护',
3 => '只维护',
'1,2'=>'自主开发&自主开发及维护'
'1,2'=>'自主开发&自主开发及维护',
];
}

@ -240,7 +240,13 @@ class CompanyStatementController extends ThinkController
$first_party_info = json_decode($dbres['first_party_info'],true);
$second_party_info = json_decode($dbres['second_party_info'],true);
$statement_info = json_decode($dbres['statement_info'],true);
foreach ($statement_info as $key => $value) {
if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") {
$statement_info[$key]['pay_amount'] = "-";
}
}
if($dbres['pay_type'] == 2){
$company = $second_party_info['partner'];
$pyinfo = $second_party_info;
@ -263,6 +269,7 @@ class CompanyStatementController extends ThinkController
"statement_info"=>$statement_info,
"statement_count"=>array("pay_amount"=>$dbres['pay_amount'],"statement_money"=>$dbres['statement_money'],"big_ratio_money"=>convertAmountToCn($dbres['statement_money']))
);
$this->assign("data",$senddata);
if($dbres["company_belong"] == 9){
@ -332,6 +339,15 @@ class CompanyStatementController extends ThinkController
$dbres['first_party_info'] = json_decode($dbres['first_party_info'], true);
$dbres['second_party_info']= json_decode($dbres['second_party_info'], true);
$dbres['statement_info'] = json_decode($dbres['statement_info'], true);
if(is_array($dbres['statement_info'])) {
foreach ($dbres['statement_info'] as $key => $value) {
if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") {
$dbres['statement_info'][$key]['pay_amount'] = "-";
}
}
}
$this->assign("data", $dbres);
if ($dbres["company_belong"] == 9) {
//上游
@ -486,6 +502,15 @@ class CompanyStatementController extends ThinkController
$data['first_party_info'] = json_decode($data['first_party_info'], 1);//甲方
$data['second_party_info'] = json_decode($data['second_party_info'], 1);//乙方
$data['statement_info'] = json_decode($data['statement_info'], 1);//结算记录
if(is_array($data['statement_info'])) {
foreach ($data['statement_info'] as $key => $value) {
if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") {
$data['statement_info'][$key]['pay_amount'] = "-";
}
}
}
//收款方
$all_sum_money = $data['pay_amount'];//合计平台总额
$all_pay_amount = $data['statement_money'];//合计结算金额

@ -20,6 +20,7 @@ class MarketPercentageController extends ThinkController
$_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
$_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
$_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
$_REQUEST['company_id']?($map['company_id'] = $_REQUEST['company_id']):'';
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id;
@ -87,7 +88,7 @@ class MarketPercentageController extends ThinkController
// var_dump($map);die();
$data = M("settleup_marketorder","tab_")
->field("pay_time,promote_account,company_belong,member.real_name,develop_type,game_name,
->field("pay_time,promote_account,company_name,company_belong,member.real_name,develop_type,game_name,
sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit")
->join("left join sys_member member on member.uid=admin_id");
@ -225,11 +226,8 @@ class MarketPercentageController extends ThinkController
die();
}
}
$search_date = [];
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
@ -308,12 +306,21 @@ class MarketPercentageController extends ThinkController
->where($map)
->count();
$page = set_pagination($count, $row);
$page = set_pagination(count($data), $row);
if ($page) {
$this->assign('_page', $page);
}
$this->checkListOrCountAuthRestMap($map,[]);
if(IS_ROOT){
$this->assign('market_check',true);
$this->assign('finance_check',true);
}else {
$exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_market_check");
$this->assign('market_check',$this->checkRule($exportRule,array('in','1,2')));
$exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_finance_check");
$this->assign('finance_check',$this->checkRule($exportRule,array('in','1,2')));
}
$all_data = M("market_altogether","tab_")
// ->where($map)
@ -333,9 +340,18 @@ class MarketPercentageController extends ThinkController
$sum['commission'] = 0;
$sum['extend_commission'] = 0;
$sum['wait_commission'] = 0;
$admin = $_SESSION['onethink_admin']['user_auth']['username'];
foreach ($data as $key => $value) {
if ($_REQUEST['export'] && session('user_group_id') == 23) {
if (!$value['market_check'] || !$value['finance_check']) {
unset($data[$key]);
continue;
}
}
$data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time']));
$data[$key]['end_time'] = date("Y-m-t",strtotime($value['pay_time']));
@ -347,6 +363,19 @@ class MarketPercentageController extends ThinkController
$data[$key]['level'] = '高级';
}
if(!$value['market_check']) {
$data[$key]['market_check_detail'] = "市场部未确认({$admin}<br>".date("Y-m-d H:m:s",time());
}
if (!$value['finance_check']) {
$data[$key]['finance_check_detail'] = "财务部未审批({$admin}<br>".date("Y-m-d H:m:s",time());
}
if ($_REQUEST['export']) {
$data[$key]['market_check_detail'] = str_replace("<br>",'',$data[$key]['market_check_detail']);
$data[$key]['finance_check_detail'] = str_replace("<br>",'',$data[$key]['finance_check_detail']);
}
$market_percentage = json_decode($value['market_percentage'],true);
//开发业绩提成比例
$data[$key]['develop_commission_ratio'] = $market_percentage['develop_commission_ratio'];
@ -505,7 +534,9 @@ class MarketPercentageController extends ThinkController
'achievement_bonus' => '绩效考核奖金',
'commission' => '当月合计',
'extend_commission' => '应发金额',
'wait_commission' => '待发金额'];
'wait_commission' => '待发金额',
'market_check_detail' => '市场部确认',
'finance_check_detail' => '财务部审批'];
foreach ($data as $key => $value) {
$line = $key+2;
@ -1151,5 +1182,50 @@ class MarketPercentageController extends ThinkController
}
}
//市场部确认操作
public function doMarketCheck() {
$ids = $_REQUEST['ids'];
if (!$ids) {
$this->ajaxReturn(['status'=>0,'info'=>'操作失败,id不能为空']);
}
$admin = $_SESSION['onethink_admin']['user_auth']['username'];
$market_check_detail = "市场部已确认({$admin}<br>".date("Y-m-d H:m:s",time());
$is_save = M("market_altogether","tab_")
->where(['id'=>['in',$ids],'market_check'=>0])
->save(['market_check'=>1,'market_check_detail'=>$market_check_detail]);
if (!$is_save) {
$this->ajaxReturn(['status'=>0,'info'=>'操作失败']);
}
$this->ajaxReturn(['status'=>1,'info'=>'市场部确认成功']);
}
//财务部审批操作
public function doFinanceCheck() {
$ids = $_REQUEST['ids'];
if (!$ids) {
$this->ajaxReturn(['status'=>0,'info'=>'操作失败,id不能为空']);
}
$admin = $_SESSION['onethink_admin']['user_auth']['username'];
$finance_check_detail = "财务部已确认({$admin}<br>".date("Y-m-d H:m:s",time());
$is_save = M("market_altogether","tab_")
->where(['id'=>['in',$ids],'finance_check'=>0])
->save(['finance_check'=>1,'finance_check_detail'=>$finance_check_detail]);
if (!$is_save) {
$this->ajaxReturn(['status'=>0,'info'=>'操作失败']);
}
$this->ajaxReturn(['status'=>1,'info'=>'市场部确认成功']);
}
}

@ -606,7 +606,7 @@ class PartnerController extends ThinkController
$this->error('请选择是否签署合同');
}
if (empty(I('company_type'))) {
$this->error('请输入公司性质');
$this->error('请输入结算性质');
}
if (!strlen(I('has_game_evidence'))) {
$this->error('请选择是否有游戏资质');

@ -43,6 +43,15 @@ class PresidentDepositController extends ThinkController
$depositWhere['status'] = $status;
}
}
if(I('amount_start', '') != '') {
$depositStrWhere .= ' and amount >= ' . I('amount_start', '');
}
if (I('amount_end', '') != '') {
$depositStrWhere .= ' and amount <= ' . I('amount_end', '');
}
if (I('pay_confirm_time_start', '') != '') {
$depositStrWhere .= ' and pay_confirm_time>=' . strtotime(I('pay_confirm_time_start') . ' 00:00:00');
}

@ -1100,7 +1100,7 @@ class TimingController extends AdminController {
->select(false);
$promote_data = M()->table("({$spend}) spend")
->field("pay_time,company_id,account as promote_account,company.company_belong,develop_type,spend.promote_id,spend.game_name,game_id,relation_game_id,spend.pay_amount,auth.real_name,market_admin_id as admin_id,market_percentage,sdk_version")
->field("pay_time,company_id,company.company_name,account as promote_account,company.company_belong,develop_type,spend.promote_id,spend.game_name,game_id,relation_game_id,spend.pay_amount,auth.real_name,market_admin_id as admin_id,market_percentage,sdk_version")
->join("left join tab_promote promote on spend.promote_id = promote.id")
->join("left join tab_promote_company company on promote.company_id = company.id")
->join("left join ({$data}) auth on auth.uid=market_admin_id")

@ -394,7 +394,7 @@ $(function(){
companyinfostr += '<tr><td class="l">内外团:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_belong+'</span></td></tr>';
}
if("company_type" in companyinfo){
companyinfostr += '<tr><td class="l">公司性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
companyinfostr += '<tr><td class="l">结算性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
}
if("company_relation" in companyinfo){
companyinfostr += '<tr><td class="l">开发类型:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_relation+'</span></td></tr>';

@ -283,7 +283,7 @@ $(function(){
companyinfostr += '<tr><td class="l">内外团:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_belong+'</span></td></tr>';
}
if("company_type" in companyinfo){
companyinfostr += '<tr><td class="l">公司性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
companyinfostr += '<tr><td class="l">结算性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
}
if("company_relation" in companyinfo){
companyinfostr += '<tr><td class="l">开发类型:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_relation+'</span></td></tr>';

@ -283,7 +283,7 @@ $(function(){
companyinfostr += '<tr><td class="l">内外团:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_belong+'</span></td></tr>';
}
if("company_type" in companyinfo){
companyinfostr += '<tr><td class="l">公司性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
companyinfostr += '<tr><td class="l">结算性质:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_type+'</span></td></tr>';
}
if("company_relation" in companyinfo){
companyinfostr += '<tr><td class="l">开发类型:</td><td class="r table_radio"><span class="form_radio table_btn">'+companyinfo.company_relation+'</span></td></tr>';

@ -343,7 +343,12 @@
_doAgreeApply();
});
}else{
_doAgreeApply();
layer.confirm('【警告】'+opname+'是否确认,如需继续请点击确认', {
btn: ['确认','取消'],
title:false
}, function() {
_doAgreeApply();
});
}
}

@ -94,7 +94,7 @@
</tr>
<tr>
<td class="l">公司性质</td>
<td class="l">结算性质</td>
<td class="r">
<span class="form-required" style="line-height: 30px;"><if condition="$data['company_properties'] eq 0">个人<else/>公司</if></span>
</td>

@ -96,7 +96,7 @@
<tr>
<th >合作方名称</th>
<th >对应平台</th>
<th >公司性质</th>
<th >结算性质</th>
<!-- <th >支付渠道</th>-->
<th >原包名</th>
<th >现包名</th>

@ -99,7 +99,7 @@
<div class="input-list input-list-spend search_label_rehab">
<select id="company_properties" name="company_properties" class="select_gallery" style="width:120px;">
<option value="">请选择公司性质</option>
<option value="">请选择结算性质</option>
<option value="0">个人</option>
<option value="1">公司</option>
</select>
@ -150,7 +150,7 @@
<tr>
<th >合作方名称</th>
<th >对应平台</th>
<th >公司性质</th>
<th >结算性质</th>
<!-- <th >支付渠道</th>-->
<th >原包名</th>
<th >现包名</th>

@ -53,6 +53,15 @@
<div class="input-list search-title-box">
<label>搜索:</label>
</div>
<div class="input-list input-list-resway search_label_rehab">
<select id="company_id" name="company_id" class="select_gallery" style="width:150px;">
<option value="">请选择推广公司</option>
<volist name=":getPromoteCompany()" id="vo">
<option value="{$vo.id}" <if condition="I('company_id') && $vo.id eq I('company_id')">selected
</if> >{$vo.company_name}</option>
</volist>
</select>
</div>
<!-- <div class="input-list input-list-promote search_label_rehab">-->
<!-- <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">-->
<!-- <option value="">请选择月份</option>-->
@ -109,6 +118,7 @@
<thead>
<tr>
<th>时间</th>
<th>公司名称</th>
<th>会长账号</th>
<th>内外团</th>
<th>所属市场专员</th>
@ -134,6 +144,7 @@
<volist name="list_data" id="data">
<tr>
<td>{$data.pay_time}</td>
<td>{$data.company_name}</td>
<td>{$data.promote_account}</td>
<td>{$data.company_belong}</td>
<td>{$data.real_name}</td>
@ -148,6 +159,7 @@
</tr>
</volist>
<tr>
<td></td>
<td></td>
<td></td>
<td>合计</td>

@ -29,7 +29,35 @@
}
a:link ,a:visited,a:hover,a:active { text-decoration: none;}
.select2-results__option[aria-selected] {font-size:12px;}
.layui-layer-dialog .layui-layer-content{color:red}
.butnbox {padding:10px 0 10px;}
.butnbox .butnlist {overflow:hidden;clear:both;}
.butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
.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;}
.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;
height: 80px;
line-height: 80px;
font-weight: 600;
font-size: 18px;
}
.data_list table td{
line-height: 2;
}
.layui-layer-title {
text-align: center;
height: 42px;
line-height: 42px;
font-weight: 400;
font-size: 14px;
}
.main-place .question_content:before{
right: 20px;
left: auto;
}
</style>
<div class="cf main-place top_nav_list navtab_list">
@ -92,7 +120,18 @@
<a class="sch-btn" href="javascript:;" id="search" url="{:U('marketStaffSettle','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
</div>
</div>
</div>
<div class="butnbox" >
<div class="butnlist jscheckbutn" style="margin-left: 2px">
<a class='butn' id='market_check' style='background-color: #3C95C8;'>市场部确认</a>
<a class='butn' id='finance_check' style='background-color: #3C95C8;'>财务部审批</a>
</div>
</div>
<!-- 数据列表 -->
<div class="data_list">
<empty name="show_status">
@ -101,6 +140,7 @@
<!-- 表头 -->
<thead>
<tr>
<th><input class="check-all" type="checkbox"></th>
<th>时间</th>
<th>市场专员</th>
<th>级别</th>
@ -111,6 +151,8 @@
<th>当月合计</th>
<th>应发金额</th>
<th>待发金额</th>
<th>市场部确认</th>
<th>财务部审批</th>
</tr>
</thead>
@ -124,6 +166,7 @@
<notemtpy name = "list_data">
<volist name="list_data" id="data">
<tr>
<td><input class="ids" type="checkbox" value="{$data['id']}" data-market_check="{$data['market_check']}" data-finance_check="{$data['finance_check']}" name="ids[]"></td>
<td>{$data.pay_time|default='无'}</td>
<td>{$data.real_name|default='无'}</td>
<td>{$data.level|default='无'}</td>
@ -135,9 +178,11 @@
<td>{$data['commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
<td><if condition="$data.market_check eq 0"><span style="color: red"></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
<td><if condition="$data.finance_check eq 0"><span style="color: red"></if>{$data['finance_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
</tr>
</volist>
<td colspan="3">合计</td>
<td colspan="4">合计</td>
<td>
<!-- <a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>'1,2'))}">-->
{$sum['performance_revenue']|default="0.00"}
@ -153,6 +198,8 @@
<td>{$sum['commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['extend_commission']|default='0.00'}</a></td>
<td></td>
<td></td>
<td></td>
</notemtpy>
</tbody>
</table>
@ -186,6 +233,98 @@
//导航高亮
highlight_subnav('{:U('MarketPercentage/marketStaffSettle')}');
$(function(){
$("#market_check").on("click",function(){
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("market_check") == 0){
return $(elem).val();
}
}).get();
if(text.length < 1){
layer.msg("<font style='color:white'>" + '无需要进行[市场部确认]的申请,仅[市场部未确认]状态可以进行[市场部确认]操作</font>');
return;
}
text = text.join(",");
layer.confirm('【警告】[市场部确认]将不可回退,如需继续请点击确认', {
btn: ['确认','取消'],
title:false
}, function(index){
layer.close(index);
_doAgreeApply();
});
function _doAgreeApply(){
//执行
layer.load(2);
$.ajax({
type: "POST",
url: "{:U('doMarketCheck')}",
dataType: 'json',
async: true,
data: {ids:text},
success:function(data){
layer.closeAll('loading');
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.location.reload();
},1500);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
}
});
$("#finance_check").on("click",function(){
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("finance_check") == 0&&$(elem).data("market_check") == 1){
return $(elem).val();
}
}).get();
if(text.length < 1){
layer.msg("<font style='color:white'>" + '无需要进行[财务部审批]的申请,仅[财务部未审批且市场部已确认]状态可以进行[财务部审批]操作</font>');
return;
}
text = text.join(",");
layer.confirm('【警告】[财务部审批]将不可回退,如需继续请点击确认', {
btn: ['确认','取消'],
title:false
}, function(index){
layer.close(index);
_doAgreeApply();
});
function _doAgreeApply(){
//执行
layer.load(2);
$.ajax({
type: "POST",
url: "{:U('doFinanceCheck')}",
dataType: 'json',
async: true,
data: {ids:text},
success:function(data){
layer.closeAll('loading');
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.location.reload();
},1500);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
}
});
//搜索功能
$("#search").click(function(){
var url = $(this).attr('url');

@ -263,7 +263,7 @@
</tr> -->
<tr>
<td class="l noticeinfo">公司性质:</td>
<td class="l noticeinfo">结算性质:</td>
<td class="r">
<select name="company_type" class="select_gallery">
<!-- <option value="0">请选择公司性质</option> -->

@ -105,7 +105,7 @@
</tr> -->
<tr>
<td class="l noticeinfo">公司性质:</td>
<td class="l noticeinfo">结算性质:</td>
<td class="r">
<select name="company_type" class="select_gallery">
<!-- <option value="0">请选择公司性质</option> -->

@ -263,7 +263,7 @@
</tr> -->
<tr>
<td class="l noticeinfo">公司性质:</td>
<td class="l noticeinfo">结算性质:</td>
<td class="r">
<select name="company_type" class="select_gallery">
<option value="1" <if condition="$data['company_type'] eq '1'"> selected="selected"</if>>公司</option>

@ -52,7 +52,7 @@
<th>合同合作方名称</th>
<th>对应平台</th>
<th>公司性质</th>
<th>结算性质</th>
<th>原包名</th>
<th>现包名</th>

@ -127,7 +127,7 @@
<th>对应平台</th>
<th>审核类型</th>
<th>公司性质</th>
<th>结算性质</th>
<th>合同期限</th>
<th>结算生效期限</th>

@ -59,7 +59,7 @@
<div class="input-list input-list-game search_label_rehab">
<select id="company_type" name="company_type" class="select_gallery" >
<option value="">请选择公司性质</option>
<option value="">请选择结算性质</option>
<option value="1">公司</option>
<option value="2">个人</option>
</select>
@ -106,7 +106,7 @@
<th>合同合作方名称</th>
<th>对应平台</th>
<th>公司性质</th>
<th>结算性质</th>
<th>原包名</th>
<th>现包名</th>

@ -90,6 +90,16 @@
<?php endforeach;?>
</select>
</div>
<div class="input-list input-list-promote search_label_rehab">
<input type="text" name="amount_start" value="{:I('amount_start')}"
placeholder="押金起始区间"/>
-
<div class="input-append date" style="display:inline-block">
<input type="text" name="amount_end" value="{:I('amount_end')}"
placeholder="押金结束区间"/>
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<div class="input-list input-list-promote search_label_rehab">
<select id="company_type" name="company_type" class="select_gallery" style="width:120px;">
<option value="">公会类型</option>

@ -191,7 +191,7 @@
</tr>
<tr>
<td class="l">公司性质:</td>
<td class="l">结算性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">

@ -119,14 +119,14 @@
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="0"></option>
<option value="1">自主开发</option>
<option value="2">自主开发及维护</option>
<!-- <option value="2">自主开发及维护</option>-->
<option value="3">只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">公司性质:</td>
<td class="l">结算性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">

@ -181,13 +181,13 @@
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="0" <if condition="$data.develop_type eq 0">selected</if>>无</option>
<option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
<option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
<!-- <option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>-->
<option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">公司性质:</td>
<td class="l">结算性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">

@ -116,13 +116,13 @@
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="0" <if condition="$data.develop_type eq 0">selected</if>>无</option>
<option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
<option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
<!-- <option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>-->
<option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">公司性质:</td>
<td class="l">结算性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">

@ -37,7 +37,7 @@
<th>对应平台</th>
<th>内外团</th>
<th>开发类型</th>
<th>公司性质</th>
<th>结算性质</th>
<th>结算周期</th>
<th>押金类型</th>
<th>押金金额</th>

@ -127,7 +127,7 @@
<th>对应平台</th>
<th>审核类型</th>
<th>公司性质</th>
<th>结算性质</th>
<th>合同期限</th>
<th>结算生效期限</th>

@ -85,7 +85,7 @@
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="company_type" name="company_type" class="select_gallery">
<option value="">请选择公司性质</option>
<option value="">请选择结算性质</option>
<option value="1" <?php echo I('company_type') === 1 ? "selected" : ''?>>公司</option>
<option value="2" <?php echo I('company_type') == 2 ? "selected" : ''?>>个人</option>
</select>
@ -151,7 +151,7 @@
<th>对应平台</th>
<th>内外团</th>
<th>开发类型</th>
<th>公司性质</th>
<th>结算性质</th>
<th width="80">是否<br>签署合同</th>
<th>结算周期</th>
<th width="100">押金类型</th>

@ -182,14 +182,14 @@
<select id="develop_type" name="develop_type" disabled class="select_gallery" style="width: 215px;">
<option value="0" <if condition="$data.develop_type eq 0">selected</if>>无</option>
<option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
<option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
<!-- <option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>-->
<option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">公司性质:</td>
<td class="l">结算性质:</td>
<td class="r" >
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" disabled name="company_type" class="select_gallery" style="width: 215px;">

Loading…
Cancel
Save