Skip to content

T
tl_estate
Commit 76e67fb4 authored by agping's avatar agping
Browse files
Options

分佣提成汇总修改

parent f43a41c4
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 43 deletions
application/index/view/finance/commission_total.html
View file @ 76e67fb4
......@@ -99,19 +99,27 @@
<option value="10">市场一部</option>
<option value="20">市场二部</option>
</select>-->
<select name="qx-store" class="form-control btn2 ld-Marheight" id="qx-store">
<select class="form-control btn4 ld-Marheight input" name="" id="district_id" >
<option value="">部门名称</option>
</select>
<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
</select>
<!--<select name="qx-store" class="form-control btn2 ld-Marheight" id="qx-store">
<option value="" selected="selected">选择部门</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">-->
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="业务员手机号" type="text" value="">
<span class="fore-span ld-Marheight">开票日期:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date">
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date" disabled="disabled">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_ticketTime" name="end_date" type="date">
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_ticketTime" name="end_date" type="date" disabled="disabled">
<div class="clear"></div>
<span class="btn btn-info btn3 " id="search">搜索</span>
......
public/resource/js/commissionTotal.js
View file @ 76e67fb4
......@@ -16,12 +16,76 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
init: function() {
//初始化dot
$("body").append(template);
//初始化收佣日期
function  getPreMonth(date)  {            
var  arr  =  date.split('-');            
var  year  =  arr[0];             
var  month  =  arr[1];             
var  day  =  arr[2];             
var  days  =  new  Date(year,  month,  0);            
days  =  days.getDate();             
var  year2  =  year;            
var  month2  =  parseInt(month)  -  1;            
if (month2  ==  0)  {                
year2  =  parseInt(year2)  -  1;                
month2  =  12;            
}            
var  day2  =  day;            
var  days2  =  new  Date(year2,  month2,  0);            
days2  =  days2.getDate();            
if (day2  >  days2)  {                
day2  =  days2;            
}            
if (month2  <  10)  {                
month2  =  '0'  +  month2;            
}            
var  t2  =  year2  +  '-'  +  month2  +  '-'  +  day2;            
return  t2;        
}
//初始化时间
var myDate = new Date();
var y = myDate.getFullYear();
var m = myDate.getMonth() + 1;
var d = myDate.getDate();
var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
var day_start = getPreMonth(day_end);
$('#create_time').val(day_start);
$('#end_time').val(day_end);
//初始化收佣日期
business.getList();
business.event();
business.getDistrict();
},
event: function() {
var _doc = $(document);
business.getDistrict(function(){
_doc.on('input', '#district_id, #district_id2', function(){
var _this = $(this);
var _id = _this.val();
_this.next().html('');//先清空
if(_id && _id != '0'){
business.getDistrictStoreList(_id, function(_data){
// var _str = '';
var _str = '<option value="0">全部</option>';
$.each(_data, function(i,item) {
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
_this.next().html(_str);
});
}else{
};
});
});
_doc.on('input', '#create_time, #end_time', function(){
$('#create_ticketTime').val($('#create_time').val());
$('#end_ticketTime').val($('#end_time').val())
});
_doc.on('input', '#create_dealtime, #end_dealtime', function(){
$('#create_ticketTime').val($('#create_dealtime').val());
$('#end_ticketTime').val($('#end_dealtime').val())
});
$("#search").click(function() {
business.getList(1);
});
......@@ -314,19 +378,30 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
getList: function(pageNo) {
business.pageNo = pageNo;
var params = {};
if($('#create_time').val()!=''||$('#end_time').val()!=''){
$('#create_dealtime').val('');
$('#end_dealtime').val('');
$('#create_ticketTime').val($('#create_time').val());
$('#end_ticketTime').val($('#end_time').val())
}
if($('#create_dealtime').val()!=''||$('#end_dealtime').val()!=''){
$('#create_time').val('');
$('#end_time').val('');
$('#create_ticketTime').val($('#create_dealtime').val());
$('#end_ticketTime').val($('#end_dealtime').val())
}
params.pageNo = business.pageNo;
params.pageSize = business.pageSize;
params.name = $('#user_name').val();
params.phone = $('#user_phone').val();
params.income_start_date = $('#create_time').val();
params.income_end_date = $('#end_time').val();
params.bargain_start_date = $('#create_dealtime').val();
params.bargain_end_date = $('#end_dealtime').val();
params.deal_start_date = $('#create_ticketTime').val();
params.deal_end_date = $('#end_ticketTime').val();
params.district_id = $("#qx-store option:selected").val(); //部门id 添加字段
params.store_name = $('#store_name').val();
params.commission_start_date = $('#create_time').val();
params.commission_end_date = $('#end_time').val();
params.deal_start_date = $('#create_dealtime').val();
params.deal_end_date = $('#end_dealtime').val();
params.operation_start_date = $('#create_ticketTime').val();
params.operation_end_date = $('#end_ticketTime').val();
params.district_id = $("#district_id").val(); //部门id 添加字段
params.store_id = $('#guest_stores').val();
$.ajax({
url: '/index/getCommissionTotalList', //获取列表
type: 'GET',
......@@ -345,36 +420,44 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
}
});
},
getDistrict: function(name) {
$.ajax({
url: '/index/getDistrictListByName',
type: 'GET',
async: true,
data: {
"pageSize": 50
},
dataType: 'json',
success: function(data) {
if(data.code == 200) {
var _html = '';
$.each(data.data, function(i, n) {
if(n.district_name == name && (typeof name != undefined)) {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
} else {
_html += '<option value="' + n.id + '">' + n.district_name + '</option>';
}
});
$("#ss-store").html(_html);
$("#qx-store").append(_html);
// $("#qx-store").html(_html);
} else {
alert('获取部门信息失败');
}
}
});
},
//调用部门 和 门店的接口
getDistrict : function (fn) {
$.ajax ({
url: '/index/getDistrict',
type: 'GET',
async: true,
data: {"pageSize":1000},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
var str = '';
$.each(data.data, function(i,item) {
str += '<option value="'+item.id+'">'+item.district_name+'</option>';
});
$("#district_id").append(str);
$("#district_id2").append(str);
fn && fn();
}
}
});
},
getDistrictStoreList: function(id, fn){
$.ajax ({
url: '/index/getDistrictStoreList',
type: 'GET',
async: true,
data: {
'id':id,
"pageSize":1000
},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
fn && fn(data.data);
}
}
});
},
exportList: function(pageNo) {
console.log(2);
business.pageNo = pageNo;
......
public/resource/js/houseList.js
View file @ 76e67fb4
......@@ -45,6 +45,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
var  t2  =  year2  +  '-'  +  month2  +  '-'  +  day2;            
return  t2;        
}
//初始化时间
var myDate = new Date();
var y = myDate.getFullYear();
var m = myDate.getMonth() + 1;
......
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