Skip to content

T
tl_estate
Commit 346d1313 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

parents 38bb1151 0b5403b6
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 29 deletions
application/api_broker/controller/Broker.php
View file @ 346d1313
...@@ -81,6 +81,10 @@ class Broker extends Basic ...@@ -81,6 +81,10 @@ class Broker extends Basic
return $this->response(101, '账号已冻结', $data['data']); return $this->response(101, '账号已冻结', $data['data']);
} }
if ($agents_data['status'] == 4) {
return $this->response(101, '该账号已被列入黑名单！', $data['data']);
}
if ($agents_data['password'] != md5($this->params['pwd'])) { if ($agents_data['password'] != md5($this->params['pwd'])) {
return $this->response(101, '密码错误', $data['data']); return $this->response(101, '密码错误', $data['data']);
} }
......
application/index/controller/Finance.php
View file @ 346d1313
...@@ -2398,7 +2398,7 @@ class Finance extends Basic ...@@ -2398,7 +2398,7 @@ class Finance extends Basic
} }
//来源 //来源
if (!empty($this->params['source'])) { if ($this->params['source'] > -1) {
$where['a.source'] = $this->params['source']; $where['a.source'] = $this->params['source'];
$is_show = 1; $is_show = 1;
} }
...@@ -2435,8 +2435,12 @@ class Finance extends Basic ...@@ -2435,8 +2435,12 @@ class Finance extends Basic
$list[$k]['source_id'] = 0; $list[$k]['source_id'] = 0;
} }
$bargain_id = $this->m_bargain->selectBargainByOrderNo('id', ['order_id', $v['order_id']]); if ($v['type'] != 10 && $v['type'] != 30) {
$list[$k]['bargain_id'] = $bargain_id[0]['id']; $bargain_id = $this->m_bargain->selectBargainByOrderNo('id', ['order_id', $v['order_id']]);
$list[$k]['bargain_id'] = $bargain_id[0]['id'];
} else {
$list[$k]['bargain_id'] = '';
}
$list[$k]['current_agent_name'] = $list[$k]['store_name'] = ""; $list[$k]['current_agent_name'] = $list[$k]['store_name'] = "";
if ($v['type'] == 92) { if ($v['type'] == 92) {
...@@ -2944,17 +2948,17 @@ class Finance extends Basic ...@@ -2944,17 +2948,17 @@ class Finance extends Basic
/*提交时间 end*/ /*提交时间 end*/
/*入账日期 start*/ /*入账日期 start*/
if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) { if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) {
$where['a.income_time'] = ['> time', $this->params['income_start_time'] . ' 00:00:00']; $where['b.income_time'] = ['> time', $this->params['income_start_time'] . ' 00:00:00'];
$is_show = 1; $is_show = 1;
} }
if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) { if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) {
$where['a.income_time'] = ['< time', $this->params['end_time'] . ' 23:59:59']; $where['b.income_time'] = ['< time', $this->params['end_time'] . ' 23:59:59'];
$is_show = 1; $is_show = 1;
} }
if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) { if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) {
$where['a.income_time'] = ['between time', [ $where['b.income_time'] = ['between time', [
$this->params['income_start_time'] . ' 00:00:00', $this->params['income_end_time'] . ' 23:59:59' $this->params['income_start_time'] . ' 00:00:00', $this->params['income_end_time'] . ' 23:59:59'
]]; ]];
$is_show = 1; $is_show = 1;
......
application/index/view/finance/adjustment.html
View file @ 346d1313
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
<!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>--> <!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>-->
<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span> <span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>
<span class="money_total_two ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268元</span> <span class="money_total_two ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu fore-span ld-Marheight">0元</span>
</form> </form>
</td> </td>
</tr> </tr>
......
application/index/view/finance/daily_details.html
View file @ 346d1313
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
} }
#container_body_img_area>div{ #container_body_img_area>div{
float: left; float: left;
width: 216px; width: 172px;
} }
.img-pre-ul { .img-pre-ul {
padding-left: 0; padding-left: 0;
......
application/index/view/finance/getCollection.html
View file @ 346d1313
...@@ -345,10 +345,10 @@ ...@@ -345,10 +345,10 @@
<option value="60">其他</option> <option value="60">其他</option>
</select> </select>
<select class="form-control btn2 ld-Marheight" id="come_from"> <select class="form-control btn2 ld-Marheight" id="come_from">
<option value="">来源</option> <option value="-1">来源</option>
<option value="0">app</option> <option value="0">app</option>
<option value="1">智能pos机</option> <option value="1">智能pos机</option>
<option value="1">调整</option> <option value="2">调整</option>
</select> </select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="带看ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" placeholder="带看ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value="">
......
public/resource/js/getCollection.js
View file @ 346d1313
...@@ -324,7 +324,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -324,7 +324,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
} else {} } else {
alert(data.msg)
}
} }
}); });
}, },
...@@ -353,7 +355,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -353,7 +355,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
})); }));
}; };
} else {} } else {
alert(data.msg)
}
} }
}); });
}, },
...@@ -484,6 +488,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -484,6 +488,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
}); });
$('#commit_home').append(str); $('#commit_home').append(str);
fn && fn(); fn && fn();
} else {
alert(data.msg);
} }
} }
}); });
...@@ -502,6 +508,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -502,6 +508,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
success: function(data) { success: function(data) {
if(data.code == 200 && data.data != null) { if(data.code == 200 && data.data != null) {
fn && fn(data.data); fn && fn(data.data);
} else {
alert(data.msg);
} }
} }
}); });
...@@ -521,7 +529,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -521,7 +529,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
getReportDataByDetail : function(val){ getReportDataByDetail : function(val){
$.post('',{'val':val},function(data){ $.post('',{'val':val},function(data){
return data ; if(data.code == 200) {
return data ;
} else {
alert(data.msg);
}
}) })
}, },
...@@ -588,7 +600,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -588,7 +600,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'order_no' : that.order_no, 'order_no' : that.order_no,
'agent_id' : that.agent_id, 'agent_id' : that.agent_id,
'report_id' : that.report_id, 'report_id' : that.report_id,
'industry_type' : that.yetai, 'industry_type' : that.yetai ? that.yetai : '' ,
'income_time' : that.income_time 'income_time' : that.income_time
}; };
...@@ -650,14 +662,21 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -650,14 +662,21 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
//上传数据 //上传数据
$.post('/index/collectingBill',params,function( data ){ $.post('/index/collectingBill',params,function( data ){
console.log(data); if(data.code == 200) {
$('#modal-linetime').modal('hide'); $('#modal-linetime').modal('hide');
} else {
alert(data.msg);
}
},'json'); },'json');
}, },
getAllPrice : function(id){ getAllPrice : function(id){
$.get('/index/getAdjustment',{'pay_id':id},function(data){ $.get('/index/getAdjustment',{'pay_id':id},function(data){
$('#could_price').text(data.data.residue_money); if(data.code == 200) {
$('#could_price').text(data.data.residue_money);
} else {
alert(data.msg);
}
}) })
}, },
...@@ -666,7 +685,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -666,7 +685,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var params = that.recervablesParams(); var params = that.recervablesParams();
console.log(params); console.log(params);
$.post('/index/getCollectionEdit',params,function(data){ $.post('/index/getCollectionEdit',params,function(data){
that.getList(that.pageNo); if(data.code == 200) {
that.getList(that.pageNo);
} else {
alert(data.msg);
}
},'json') },'json')
}, },
...@@ -738,7 +761,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -738,7 +761,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var that = receiv; var that = receiv;
var params = that.buildSearchParams(true); var params = that.buildSearchParams(true);
$.post('',params, function(data){ $.post('',params, function(data){
console.log(data); if(data.code == 200) {
} else {
alert(data.msg);
}
}) })
window.open('/index/getCollection' +params); window.open('/index/getCollection' +params);
}, },
...@@ -789,8 +816,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -789,8 +816,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
paramsStr += "pay_type=" + maintable_pay_type + "&" paramsStr += "pay_type=" + maintable_pay_type + "&"
} }
if ( come_from ) { if ( come_from ) {
params.soucre = come_from; params.source = come_from;
paramsStr += "soucre=" + come_from + "&" paramsStr += "source=" + come_from + "&"
} }
if ( order_id ) { if ( order_id ) {
params.order_id = order_id; params.order_id = order_id;
...@@ -888,9 +915,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -888,9 +915,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'pay_id' : id 'pay_id' : id
}; };
$.post('/index/getCollectionDetail',params , function(data){ $.post('/index/getCollectionDetail',params , function(data){
console.log("12321321321321313213213") if(data.code == 200) {
console.log(data); that.getValueFunction(data.data);
that.getValueFunction(data.data); } else {
alert(data.msg);
}
},'json') },'json')
}, },
...@@ -949,7 +978,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -949,7 +978,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
} else { } else {
$("#comes").text('调整'); $("#comes").text('调整');
} }
doc.find("#status").text(data.soucre_id); doc.find("#status").text(data.source_id);
doc.find("#lastTime").val(data.last_transfer_time); doc.find("#lastTime").val(data.last_transfer_time);
if ( data.type == 91 || data.type == 92) { if ( data.type == 91 || data.type == 92) {
...@@ -978,7 +1007,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -978,7 +1007,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var that = receiv; var that = receiv;
$.get('/index/getBeForNum',{'order_id':id},function(data){ $.get('/index/getBeForNum',{'order_id':id},function(data){
// $('#shop_id_change').text(data.data.house_number); // $('#shop_id_change').text(data.data.house_number);
that.yetai = data.data.industry_type; if(data.code == 200) {
that.yetai = data.data.industry_type;
} else {
alert(data.msg);
}
},'json') },'json')
}, },
/** /**
...@@ -992,8 +1025,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -992,8 +1025,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
'pay_id' : id 'pay_id' : id
}; };
$.post('/index/delPayLog',params , function(data){ $.post('/index/delPayLog',params , function(data){
console.log(data); if(data.code == 200) {
that.getList(1); that.getList(1);
} else {
alert(data.msg);
}
},'json') },'json')
} }
}; };
......
public/resource/js/pkWeekList.js
View file @ 346d1313
...@@ -94,7 +94,23 @@ define(['doT', 'text!temp/pk_week_list_template_tpl.html.html', 'css!style/home. ...@@ -94,7 +94,23 @@ define(['doT', 'text!temp/pk_week_list_template_tpl.html.html', 'css!style/home.
}); });
//生成pk榜 //生成pk榜
_doc.on('click', '.produce-pk', function(e){ _doc.on('click', '.produce-pk', function(e){
//比赛时间 大于 分档时间
var start_ = $('#create_time_start').val()+" 00:00:00";
date_start =new Date(Date.parse(start_.replace(/-/g, "/")));
var start_time =date_start.getTime();
var end_ = $('#sort_time_end').val()+" 00:00:00";
date_end =new Date(Date.parse(end_.replace(/-/g, "/")));
var end_time =date_end.getTime();
if(!(start_time*1 > end_time*1)){
alert('分档根据时间的结束时间要 小于 比赛时间的开始时间！');
return;
};
pkList.setPkTime(); pkList.setPkTime();
pkList.getList();
}); });
$(".export-pk").click(function() { //导出列表 $(".export-pk").click(function() { //导出列表
if(pkList.mainTabIndexTeam){ if(pkList.mainTabIndexTeam){
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 346d1313
<!--中介费--> <!--中介费-->
<script id="a_financial_daily_list_tpl" type="text/template"> <script id="a_financial_daily_list_tpl" type="text/template">
[% if(it.length) { %] [% if(it.length) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
......
public/resource/template/receivables_template_tpl.html
View file @ 346d1313
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a> <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>
[% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %] [% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]
<a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]' <a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'
data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]' >调整</a> data-order_id = '[%= it[item]['order_id'] %]' data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]' >调整</a>
[% } %] [% } %]
<!--<a class="btn1 btn-success money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]'>退款</a>--> <!--<a class="btn1 btn-success money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]'>退款</a>-->
<a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</a> <a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment