Skip to content

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

财务日报修改

parent cc2a9757
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 29 deletions
application/index/view/finance/account_statement.html
View file @ 91d8b242
......@@ -670,29 +670,55 @@
<!-- /.modal -->
</div>
<!--商铺详情 弹出框-->
<!--商铺详情 跟进记录-->
<div class="modal fade" id="modal_shop_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content" style="height: 700px;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
&times;
</button>
<h4 class="modal-title">
商铺详情
<h4 class="modal-title detail-modal-header-tab-liu" >
<a href="javascript:;" class="btn btn-default">查看商铺</a>
<a href="javascript:;" class="btn btn-info">商铺跟进</a>
</h4>
</div>
<div class="modal-body">
<div class="modal-body modal-body-one">
<div class="detail-modal-body-sec-liu">
<iframe class="iframe-shop-detail"></iframe>
</div>
<div class="detail-modal-body-sec-liu">
<div class="followup-modal-list-area">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="" id="modal_followup_table_list">
<tr>
<td>电话跟进：测试测试测试测试测试测试测试测试测试测试测试测试</td>
<td>刘丹丹</td>
<td>2017-09-05 15:22:33</td>
</tr>
<tr>
<td colspan="3">2017-09-05 15:22:33</td>
</tr>
</tbody>
</table>
</div>
<!--<div class="followup-modal-comment-area">
<textarea></textarea>
</div>
<div class="btn-top-house">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="modal_followup_submit_btn">提交</button>
</div>-->
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
</div>
</div>
<!--客户详情 弹出框-->
<!--客户详情 客户跟进 不可编辑-->
<div class="modal fade" id="modal_user_detail" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
......
application/index/view/finance/daily_details.html
View file @ 91d8b242
......@@ -95,7 +95,7 @@
overflow: hidden;
}
.modal-body-width{
width: 800px;
width: 900px;
}
.span-del2,.span-del{
color: red;
......@@ -286,12 +286,12 @@
<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>
<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>
<th class="text-center">入账日期</th>
......@@ -316,11 +316,11 @@
<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>
<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>
......@@ -346,10 +346,10 @@
<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>
<th class="text-center">所属门店</th>
<th class="text-center">意向金收条编号</th>
<th class="text-center">入账日期</th>
<th class="text-center">操作</th>
......@@ -369,13 +369,14 @@
<thead>
<tr class="maintable-tr-bar">
<th class="text-center">收款ID</th>
<th class="text-center">订单ID</th>
<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>
<th class="text-center">所属门店</th>
<th class="text-center">保管金收条编号</th>
<th class="text-center">入账日期</th>
<th class="text-center">操作</th>
......@@ -1162,4 +1163,175 @@
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 成交报告详情 -->
<div class="modal fade" id="modal_detail_liu" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" style="width: 1080px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
成交报告详情
</h4>
</div>
<div class="modal-body detail-modal-body">
<iframe class="iframe-bargaininfo-static" name="iframe_bargaininfo_static"></iframe>
<a class="btn1 bargain-detail-shop btn-info" href="#modal_shop_detail" data-toggle="modal" style="display: none;">商铺</a>
<a class="btn1 caozuo genj_ure btn-info" href="#modal_user_detail" data-toggle="modal" style="display: none;">客户</a>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
</div>
<!-- 弹出框 时间轴 -->
<div class="modal fade" id="modal-time-liu" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
时间轴
</h4>
</div>
<div class="modal-body" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 调整详情 -->
<div class="modal fade" id="modal-addPicLiu" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-body-width">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> × </button>
<h4 class="modal-title"> 调整详情 </h4>
</div>
<div class="modal-body modal-body-height">
<form class="">
<div class="col-xs-12">
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整ID:</span></strong>
<span id="change_id" class="col-xs-6 ld-Marheight">forgina</span>
</div>
</div>
<div class="col-xs-6">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整金额:</span></strong>
<span id="after_into_price" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">调整前:</span></strong>
</div>
</div>
<div class="col-xs-12">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账ID:</span></strong>
<span id="befor_into_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">订单ID:</span></strong>
<span id="befor_order_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">房源ID:</span></strong>
<span id="befor_house_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">房源地址:</span></strong>
<span id="befor_house_addr" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账日期 :</span></strong>
<span id="befor_into_date" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账类型:</span></strong>
<span id="befor_into_type" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">调整后:</span></strong>
</div>
</div>
<div class="col-xs-12">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账ID:</span></strong>
<span id="after_into_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">订单ID:</span></strong>
<span id="after_order_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">成交报告ID:</span></strong>
<span id="after_report_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">房源ID:</span></strong>
<span id="after_house_id" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">房源地址:</span></strong>
<span id="after_house_addr" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账日期 :</span></strong>
<span id="after_into_date" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账类型:</span></strong>
<span id="after_into_type" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
application/index/view/finance/daily_list.html
View file @ 91d8b242
......@@ -73,6 +73,13 @@
<tr>
<td colspan="14">
<form id="maintable_form_search">
<select class="form-control btn2 margin-top-ld" id="my-review">
<option value="-1">选择城市</option>
<option value="1">上海市</option>
<option value="0">杭州市</option>
<option value="0">深圳市</option>
</select>
<span class="fore-span margin-left-10">提交时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
<span class="fore-span margin-left-10">至</span>
......
public/resource/js/financial_manager_daily_list.js
View file @ 91d8b242
......@@ -266,7 +266,23 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
bargain.operationStatus = 1;
bargain.submitPassReport();
});
//点击成交报告ID，获取报告详情
_doc.on('click', '.details-btn-liu', function() {
var _id = $(this).attr("data-id");
$('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc?orderid='+_id).load;
});
//时间轴点击事件
_doc.on('click', 'a[href="#modal-time-liu"]', function(e){
e.preventDefault();
e.stopPropagation();
var _id = $(this).attr("data-id");
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
});
//获取调整详情
$(document).on('click','.add-pic-liu',function(e){
var id = e.target.dataset.id;
bargain.getAdjustmentDetail(id);
});
//打印功能
_doc.on('click', '.is-print', function(e) {
e.preventDefault();
......@@ -1086,6 +1102,35 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
};
return params ;
},
//获取调整详情
getAdjustmentDetail : function(id){
var that = bargain ;
$.get('/index/getAdjustmentDetail',{'id' : id},function(data){
if(data.code == 200) {
that.setValue(data.data);
} else {
alert(data.msg);
}
},'json');
},
setValue : function(data){
var that = bargain ;
$('#change_id').text(data.id);
$('#befor_into_id').text(data.adjustment_old[0].id);
$('#befor_order_id').text(data.adjustment_old[0].order_id);
$('#befor_house_id').text(data.adjustment_old[0].house_id);
$('#befor_house_addr').text(data.adjustment_old[0].internal_address);
$('#befor_into_date').text(data.adjustment_old[0].income_time);
$('#befor_into_type').text(data.adjustment_old[0].type);
$('#after_into_id').text(data.adjustment[0].id);
$('#after_order_id').text(data.adjustment[0].order_id);
$('#after_report_id').text(data.adjustment[0].bargain_id);
$('#after_house_id').text(data.adjustment[0].house_id);
$('#after_house_addr').text(data.adjustment[0].internal_address);
$('#after_into_date').text(data.adjustment[0].income_time);
$('#after_into_type').text(data.adjustment[0].type);
$('#after_into_price').text(data.money);
},
};
return bargain;
......
public/resource/js/refundList.js
View file @ 91d8b242
......@@ -539,7 +539,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
exportExcel : function(){
var that = refund;
var params = that.buildSearchParams();
$.post('/index/refundListExcel',params, function(data){
$.get('/index/refundListExcel',params, function(data){
if(data.code == 200) {
} else {
alert(data.msg);
......
public/resource/js/reportList.js
View file @ 91d8b242
......@@ -16,6 +16,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
isBargaininfoSaveIngFlag: false,//成交信息保存是否正在保存
shouyong_date_active_sapn: null,
house_fatherid:'',
detailTabIndexLiu:0,//查看 弹出框 tab切换 初始化
init: function() {
//初始化dot
$(document.body).append(template);
......@@ -30,7 +31,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
e.preventDefault();
e.stopPropagation();
var _this = $(this);
_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
bargain.mainTabIndex = _this.index();
console.log(bargain.mainTabIndex);
......@@ -42,7 +42,24 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
e.stopPropagation();
var _id=bargain.detail_shop_id;
$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+_id);//记得修改修改
$('.detail-modal-header-tab-liu>a:nth-of-type(1)').removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
$('.detail-modal-body-sec-liu:nth-of-type(1)').show().siblings().hide();
});
//商铺详情页面 商铺跟进 商铺详情 切换
_doc.on('click', '.detail-modal-header-tab-liu>a', function(e){
e.preventDefault();
e.stopPropagation();
var _this = $(this);
_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
bargain.detailTabIndexLiu = _this.index();
$('.detail-modal-body-sec-liu:nth-of-type('+(bargain.detailTabIndexLiu+1)+')').show().siblings().hide();
if(bargain.detailTabIndexLiu == 0){
$('.iframe-shop-detail').attr('src', '/app_broker/shop_detail_pc?shop_id='+bargain.detail_shop_id);
}else if(bargain.detailTabIndexLiu == 1){
bargain.getFollowupList();
}
});
//成交报告详情 点击客户 查看客户详情
_doc.on('click', 'a[href="#modal_user_detail"]', function(e){
var _id=bargain.detail_user_id;
......@@ -802,6 +819,38 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
}
});
},
//获取商铺跟进记录
getFollowupList: function(){
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$.ajax({
'type': 'get',
'url': '/broker/getListByHouseId',
data: {
'house_id': bargain.detail_shop_id,
'AuthToken': user_info_obj.AuthToken
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
if(data.data && Array.isArray(data.data) && data.data.length>0) {
var _htmlTemp = '';
$.each(data.data, function(i, v) {
_htmlTemp += '<tr><td>{0}</td><td>{1}</td><td>{2}</td></tr>'.stringFormatObj({
'0': dealPunctuation(v.step),
'1': v.agent_name,
'2': v.create_time
})
});
$('#modal_followup_table_list').html(_htmlTemp);
}else{
$('#modal_followup_table_list').html('<tr><td>暂无数据</td></tr>');
}
} else {
alert('请登录！');
}
}
});
},
//分佣方 姓名搜索
search_phone: function() { //手机号新增客户
$.ajax({
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 91d8b242
......@@ -5,7 +5,8 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td>
<!--<td>[%= it[item]['bargain_id'] %]</td>-->
<td><a class="details-btn-liu" href="#modal_detail_liu" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>[%= it[item]['bargain_id'] %]</a></td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td>
<td>[% if(it[item]["type_ext"] == 0) { %]
......@@ -15,6 +16,7 @@
[% } %]
</td>
<td>[%= it[item]['money']%]</td>
<td>[%= it[item]['transaction_fee']%]</td>
<td>[%= it[item]['received_money']%]</td>
<td>[% if(it[item]["type_ext"] == 0) { %]
[%= (it[item]['money']*1 - (it[item]['price']*0.7)).toFixed(2) %]
......@@ -25,7 +27,6 @@
<td>[%= sw(it[item]['pay_type'])%]</td>
<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= swopen(it[item]['is_open']) %]</td>
<td>[%= swred(it[item]['is_dividend'])%]</td>
<td>[%= it[item]['income_time'] %]</td>
......@@ -51,15 +52,15 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td>
<td><a class="details-btn-liu" href="#modal_detail_liu" data-toggle="modal" data-id='[%= it[item]["bargain_id"] %]'>[%= it[item]['bargain_id'] %]</a></td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td>
<td>[%= it[item]['money']%]</td>
<td>[%= it[item]['transaction_fee']%]</td>
<td>[%= it[item]['received_money']%]</td>
<td>[%= sw(it[item]['pay_type']) %]</td>
<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<td>[%= it[item]['agent_name']%]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= swopen(it[item]['is_open']) %]</td>
<td>[%= swred(it[item]['is_dividend'])%]</td>
<td>[%= it[item]['remark'] %]</td>
......@@ -85,14 +86,15 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['order_id'] %]</td>
<!--<td>[%= it[item]['order_id'] %]</td>-->
<td><a href="#modal-time-liu" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>[%= it[item]['order_id'] %]</a></td>
<td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['house_address']%]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['transaction_fee']%]</td>
<td>[%= sw(it[item]['pay_type']) %]</td>
<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['store_name']%]</td>
<td>[%= it[item]['receipt_number'] %]</td>
<td>[%= it[item]['income_time'] %]</td>
......@@ -117,13 +119,15 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<!--<td>[%= it[item]['order_id'] %]</td>-->
<td><a href="#modal-time-liu" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>[%= it[item]['order_id'] %]</a></td>
<td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['money']%]</td>
<td>[%= it[item]['transaction_fee']%]</td>
<td>[%= sw(it[item]['pay_type']) %]</td>
<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
<td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['receipt_number'] %]</td>
<td>[%= it[item]['income_time'] %]</td>
......@@ -156,6 +160,7 @@
<td>[% if(it[item]["receipt_number"] != null) { %] [%= it[item]["receipt_number"] %] [% } %]</td>
<td>[%= it[item]['money'] %]</td>
<td>
<a class="btn1 btn-info add-pic-liu" href="#modal-addPicLiu" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['pay_log_id'] %]" data-toggle="modal">资料</a>
</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