Skip to content

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

税费明细 实收明细 修改

parent b96239e1
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 67 deletions
application/index/view/finance/commission.html
View file @ bfe2b288
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
.clear{ .clear{
clear: both; clear: both;
} }
.font-size-16{
font-size: 16px;
font-weight: 600;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -58,7 +62,7 @@ ...@@ -58,7 +62,7 @@
<div class=""> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">分佣提成明细表</a></li> <li><a href="#">实收明细</a></li>
</div> </div>
<div class="panel-body"> <div class="panel-body">
...@@ -74,16 +78,20 @@ ...@@ -74,16 +78,20 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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="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=""> <select name="district_id" class="form-control btn4 ld-Marheight">
<option value="">分佣方所在部门</option>
<div class="clear"> </select>
<select name="store_id" class="form-control btn4 ld-Marheight">
</div> <option value="">分佣方所在门店</option>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="业务员手机号" type="text" value=""> </select>
<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="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value="">
<div class="clear"></div>
<span class="btn btn-info btn3" id="search">搜索</span> <span class="btn btn-info btn3" id="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span> <span class="btn btn-info btn3" id="reset">重置</span>
<span class="btn btn-info btn3" id="export">导出excel</span> <span class="btn btn-info btn3" id="export">导出excel</span>
<span class="ld-Marheight font-size-16">实收总计：</span><span id="money_total" class="ld-Marheight font-size-16"></span>
</form> </form>
</td> </td>
</tr> </tr>
......
application/index/view/finance/tax.html
View file @ bfe2b288
...@@ -60,6 +60,12 @@ ...@@ -60,6 +60,12 @@
.padding-top { .padding-top {
padding: 15px 0px 0px 15px; padding: 15px 0px 0px 15px;
} }
.right{
float: right;
}
.font-size-16{
font-size: 16px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -67,7 +73,7 @@ ...@@ -67,7 +73,7 @@
<div class=""> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">税费承担明细表</a></li> <li><a href="#">税费明细</a></li>
</div> </div>
<div class="panel-body"> <div class="panel-body">
...@@ -83,25 +89,22 @@ ...@@ -83,25 +89,22 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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="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_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=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="分佣方手机号" type="text" value="">
<div class="clear"> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告ID" type="text" value="">
<div class="col-xs-8">
</div>
<div class="col-xs-8 padding-top">
<span class="btn btn-info btn3" id="search">搜索</span> <span class="btn btn-info btn3" id="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span> <span class="btn btn-info btn3" id="reset">重置</span>
<!--<span class="btn btn-info btn3" id="export">导出excel</span>--> <span class="btn btn-info btn3" id="export">导出excel</span>
<strong class="right padding-top font-size-16"><span>税费合计:</span><span id="taxTotal">15000</span></strong>
</div> </div>
<div class="col-xs-4 total-data padding-top">
<strong></strong><span>税费合计:</span><span id="taxTotal">15000</span></strong>
</div>
</form> </form>
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="text-center">成交报告ID</th>
<th class="text-center">开票日期</th> <th class="text-center">开票日期</th>
<th class="text-center">所属部门/门店</th> <th class="text-center">所属部门/门店</th>
<th class="text-center">业务员</th> <th class="text-center">业务员</th>
......
public/resource/js/commission.js
View file @ bfe2b288
...@@ -40,7 +40,29 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n ...@@ -40,7 +40,29 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n
$("#export").click(function() { //导出列表 $("#export").click(function() { //导出列表
bargain.exportList(); bargain.exportList();
}); });
//分佣方 所属部门 门店 筛选
bargain.getDistrict(function() {
_doc.on('input', '[name=district_id],#district_id2', function() {
var _this = $(this);
var _id = _this.val();
_this.next().html(''); //先清空
//新增 编辑
var _objTemp = _this.parent().next().find('select');
_objTemp.html(''); //先清空
if(_id && _id != '0') {
bargain.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>';
});
_objTemp.html(_str);
_this.next().html(_str);
});
} else {};
});
});
//搜索按钮的事件 //搜索按钮的事件
_doc.on('click', '#maintable_search', function(e) { _doc.on('click', '#maintable_search', function(e) {
e.preventDefault(); e.preventDefault();
...@@ -53,15 +75,6 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n ...@@ -53,15 +75,6 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n
document.getElementById("maintable_form_search").reset(); document.getElementById("maintable_form_search").reset();
}); });
//时间轴按钮
// _doc.on("click", ".timeline", function() {
// bargain.bargain_id = $(this).closest('tr').attr("data-id");
// bargain.father_id = $(this).closest('tr').attr("data-fatherid");
// bargain.order_id = $(this).closest('tr').attr("data-orderid");
//
// bargain.Timeline();
// });
//转到一级审核 //转到一级审核
_doc.on('click', '.maintable-btn-trans-one', function(e){ _doc.on('click', '.maintable-btn-trans-one', function(e){
e.preventDefault(); e.preventDefault();
...@@ -1032,22 +1045,6 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n ...@@ -1032,22 +1045,6 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n
} }
}); });
}, },
//获取一级审核，二级审核，三级审核，结单不同的ajax请求url
// switchUrl: function(){
// switch (Number(this.mainTabIndex)){
// case 0:
// return '/index/reportListOne/1';
// case 1:
// return '/index/reportListTwo/2';
// case 2:
// return '/index/reportListThree/3';
// case 3:
// return '/index/reportListStatement/4';
// default:
// return '';
// }
// },
//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
getList: function(pageNo) { getList: function(pageNo) {
bargain.pageNo = pageNo; bargain.pageNo = pageNo;
var params = {}; var params = {};
...@@ -1072,7 +1069,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n ...@@ -1072,7 +1069,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_n
var temp = document.getElementById('commission_list_tpl').innerHTML; var temp = document.getElementById('commission_list_tpl').innerHTML;
var doTtmpl = doT.template(temp); var doTtmpl = doT.template(temp);
$("#business_list").html(doTtmpl(data.data.data.list)); $("#business_list").html(doTtmpl(data.data.data.list));
$("#money_total").html('6666666666');//实收总计
/*分页代码*/ /*分页代码*/
add_page(data.data.data.total, pageNo, bargain.pageSize, bargain.getList); add_page(data.data.data.total, pageNo, bargain.pageSize, bargain.getList);
} else { } else {
......
public/resource/js/tax.js
View file @ bfe2b288
...@@ -1029,22 +1029,6 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t ...@@ -1029,22 +1029,6 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t
} }
}); });
}, },
//获取一级审核，二级审核，三级审核，结单不同的ajax请求url
// switchUrl: function(){
// switch (Number(this.mainTabIndex)){
// case 0:
// return '/index/reportListOne/1';
// case 1:
// return '/index/reportListTwo/2';
// case 2:
// return '/index/reportListThree/3';
// case 3:
// return '/index/reportListStatement/4';
// default:
// return '';
// }
// },
//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
getList: function(pageNo) { getList: function(pageNo) {
bargain.pageNo = pageNo; bargain.pageNo = pageNo;
var params = {}; var params = {};
...@@ -1056,8 +1040,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t ...@@ -1056,8 +1040,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t
params.name = $('#user_name').val(); params.name = $('#user_name').val();
params.phone = $('#user_phone').val(); params.phone = $('#user_phone').val();
params.house_number = $('#internal_num').val(); params.house_number = $('#internal_num').val();
params.bargain_id = $('#bargain_id').val();//税费明细 成交报告ID筛选
$.ajax({ $.ajax({
url: '/index/getTallAgeList', //获取列表 url: '/index/getTallAgeList', //获取列表
type: 'GET', type: 'GET',
...@@ -1079,8 +1062,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t ...@@ -1079,8 +1062,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t
} }
}); });
}, },
exportList: function(pageNo) { exportList: function(pageNo) {//导出税费明细列表
//导出分佣提成列表
bargain.pageNo = pageNo; bargain.pageNo = pageNo;
var create_time = $('#create_time').val(); var create_time = $('#create_time').val();
var end_time = $('#end_time').val(); var end_time = $('#end_time').val();
...@@ -1088,7 +1070,8 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t ...@@ -1088,7 +1070,8 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_t
var agent = $('#user_name').val(); var agent = $('#user_name').val();
var user_phone = $('#user_phone').val(); var user_phone = $('#user_phone').val();
var house_number = $('#internal_num').val(); var house_number = $('#internal_num').val();
window.open('/index/exportExcel?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&name=' + agent + '&phone=' + user_phone + '&house_number=' + house_number); var bargain_id = $('#bargain_id').val();
window.open('/index/exportExcel?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&name=' + agent + '&phone=' + user_phone + '&house_number=' + house_number+ '&bargain_id=' + bargain_id);
}, },
}; };
......
public/resource/template/tax_template_tpl.html
View file @ bfe2b288
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
[% if(it) { %] [% if(it) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr class="text-center" data-id="[%= it[item]['bargain_id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]"> <tr class="text-center" data-id="[%= it[item]['bargain_id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
<td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['operation_date'] %]</td> <td>[%= it[item]['operation_date'] %]</td>
<td>[%= it[item]['district_store'] %]</td> <td>[%= it[item]['district_store'] %]</td>
<td>[%= it[item]['name'] %]</td> <td>[%= it[item]['name'] %]</td>
......
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