Skip to content

T
tl_estate
Commit 020d2060 authored by zw's avatar zw
Browse files
Options

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

parents 351cf661 aed53e8e
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 88 deletions
application/index/view/finance/daily_details.html
View file @ 020d2060
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<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>
...@@ -143,7 +142,6 @@ ...@@ -143,7 +142,6 @@
<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>
...@@ -223,12 +221,10 @@ ...@@ -223,12 +221,10 @@
<th class="text-center">调整ID</th> <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> <th class="text-center">调整金额</th>
<th class="text-center">所属门店</th>
<th class="text-center">附件</th> <th class="text-center">附件</th>
</tr> </tr>
</thead> </thead>
...@@ -265,80 +261,82 @@ ...@@ -265,80 +261,82 @@
<span id="pay_a"></span> <span id="pay_a"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_b"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_c"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_d"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_e"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_f"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_g"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_h"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_i"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_a"></span> <span id="pay_j"></span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<!--7--> <!--7-->
<h4> <div class="audit-records">
审核记录 <h4>
</h4> 审核记录
<div class="table-responsive"> </h4>
<table class="table table-striped table-bordered table-hover table-condensed"> <div class="table-responsive">
<thead> <table class="table table-striped table-bordered table-hover table-condensed">
<tr class="maintable-tr-bar"> <thead>
<th class="text-center">支付宝转账</th> <tr class="maintable-tr-bar">
<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">3000账号</th> <th class="text-center">世家公账</th>
<th class="text-center">现金</th> <th class="text-center">3000账号</th>
<th class="text-center">POS机</th> <th class="text-center">现金</th>
<th class="text-center">其他</th> <th class="text-center">POS机</th>
<th class="text-center">审核人</th> <th class="text-center">其他</th>
<th class="text-center">审核时间</th> <th class="text-center">审核人</th>
</tr> <th class="text-center">审核时间</th>
</thead> </tr>
<tbody class="text-center" id="maintable_list_a"> </thead>
<tr> <tbody class="text-center" id="maintable_list_a">
<td class="text-center">555</td> <tr>
<td class="text-center">5</td> <td class="text-center">555</td>
<td class="text-center">6</td> <td class="text-center">5</td>
<td class="text-center">3</td> <td class="text-center">6</td>
<td class="text-center">2</td> <td class="text-center">3</td>
<td class="text-center">2</td> <td class="text-center">2</td>
<td class="text-center">33</td> <td class="text-center">2</td>
<td class="text-center">22</td> <td class="text-center">33</td>
<td class="text-center">15517301736</td> <td class="text-center">22</td>
<td class="text-center">2017.3.6</td> <td class="text-center">15517301736</td>
</tr> <td class="text-center">2017.3.6</td>
</tbody> </tr>
</table> </tbody>
</table>
</div>
</div> </div>
<div class="is-submit-div"> <div class="is-submit-div">
<div class="is-submit">提交</div> <div class="is-submit">提交</div>
<div class="is-submit-pass">审核通过</div> <div class="is-submit-pass">审核通过</div>
<div class="is-submit-passed">转到已审核</div> <div class="is-submit-passed">转到已审核</div>
</div> </div>
</div>
</div> </div>
</div> </div>
......
public/resource/js/financial_manager_daily_list.js
View file @ 020d2060
...@@ -13,6 +13,13 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -13,6 +13,13 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
financialTime: '',//应收总佣金 financialTime: '',//应收总佣金
init: function() { init: function() {
//初始化时间
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);
$('#create_time_start').val(day_end);//店长日报默认当天
//初始化dot //初始化dot
if(getUrlParam('time')){ if(getUrlParam('time')){
$('#create_time_start').hide(); $('#create_time_start').hide();
...@@ -40,7 +47,11 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -40,7 +47,11 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
console.log(bargain.mainTabIndex); console.log(bargain.mainTabIndex);
bargain.getList(1); bargain.getList(1);
}); });
//店长日报 时间搜索
_doc.on('input', '#create_time_start', function() {
bargain.financialTime = $('#create_time_start').val();
bargain.getList(1);
});
//搜索按钮的事件 //搜索按钮的事件
_doc.on('click', '#maintable_search', function(e) { _doc.on('click', '#maintable_search', function(e) {
e.preventDefault(); e.preventDefault();
...@@ -107,7 +118,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -107,7 +118,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
'AuthToken':user_info_obj.AuthToken, 'AuthToken':user_info_obj.AuthToken,
'store_id': 730, 'store_id': 730,
'is_store': 0, 'is_store': 0,
'daily_data': bargain.financialTime // 'daily_data': bargain.financialTime
'daily_data': '2018-12-01'
}; };
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
...@@ -137,15 +149,35 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -137,15 +149,35 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
//调整出账 //调整出账
var doTtmpl = doT.template(document.getElementById('e_financial_daily_list_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('e_financial_daily_list_tpl').innerHTML);
$("#maintable_list_e").html(doTtmpl(data.data.list.adjustment)); $("#maintable_list_e").html(doTtmpl(data.data.list.adjustment));
//总计
if(data.data.is_commit*1){
$('#pay_a').html(data.data.commit_info.other_bank);
}
//判断店长是否提交过 //判断店长是否提交过
if(data.data.is_commit*1){ if(data.data.is_commit*1){//提交过
$('.is-submit').html('已提交'); $('.is-submit').hide();
}else{ //总计commit_info
$('.is-submit').html('未提交'); $('#pay_a').html(data.data.commit_info.other_bank);
$('#pay_b').html(data.data.commit_info.other_bank);
$('#pay_c').html(data.data.commit_info.other_bank);
$('#pay_d').html(data.data.commit_info.other_bank);
$('#pay_e').html(data.data.commit_info.other_bank);
$('#pay_f').html(data.data.commit_info.other_bank);
$('#pay_g').html(data.data.commit_info.other_bank);
$('#pay_h').html(data.data.commit_info.other_bank);
$('#pay_i').html(data.data.commit_info.other_bank);
$('#pay_j').html(data.data.commit_info.other_bank);
}else{//未提交
$('.is-submit').html('提交');
$('.audit-records').hide();
//未提交
$('#pay_a').html(data.data.total_info.alipay);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
$('#pay_a').html(data.data.total_info.other_bank);
} }
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 020d2060
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['price']%]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price']*0.8 %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['money']%]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['pay_type']%]</td> <td>[%= it[item]['pay_type']%]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[%= it[item]['transfer_name'] %]</td>
...@@ -37,15 +36,14 @@ ...@@ -37,15 +36,14 @@
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['bargain_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['price']%]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price']*0.8 %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['pay_type'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['pay_type']%]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[%= it[item]['transfer_name'] %]</td>
<td>[%= it[item]['agent_name'] %]</td> <td>[%= it[item]['agent_name']%]</td>
<td>[%= it[item]['store_name'] %]</td> <td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['is_open'] %]</td> <td>[%= it[item]['is_open'] %]</td>
<td>[%= it[item]['is_dividend'] %]</td>
<td>[%= it[item]['is_open1'] %]</td>
<td> <td>
<a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a> <a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
</td> </td>
...@@ -63,16 +61,16 @@ ...@@ -63,16 +61,16 @@
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<td>[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['bargain_id1'] %]</td>
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['house_address']%]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['pay_type'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['pay_type']%]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[%= it[item]['transfer_name'] %]</td>
<td>[%= it[item]['agent_name'] %]</td> <td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['store_name']%]</td>
<td>[%= it[item]['transfer_name1'] %]</td>
<td>[%= it[item]['receipt_number'] %]</td>
<td> <td>
<a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a> <a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
</td> </td>
...@@ -90,15 +88,15 @@ ...@@ -90,15 +88,15 @@
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<td>[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['price']%]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['pay_type'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['pay_type']%]</td>
<td>[%= it[item]['transfer_name'] %]</td> <td>[%= it[item]['transfer_name'] %]</td>
<td>[%= it[item]['agent_name'] %]</td>
<td>[%= it[item]['store_name'] %]</td>
<td>[%= it[item]['pay_type1']%]</td>
<td>[%= it[item]['receipt_number'] %]</td>
<td> <td>
<a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a> <a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
</td> </td>
...@@ -116,14 +114,35 @@ ...@@ -116,14 +114,35 @@
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<td>[%= it[item]['id'] %]</td> <td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['bargain_id'] %]</td> <td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td> <td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['price']%]</td> <td>[%= it[item]['type']%]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['receipt_number'] %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price'] %]</td>
<td>
<a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
</td>
</tr>
[% } %]
[% }else{ %]
<tr>
<td colspan="15" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
<!--审核记录-->
<script id="f_financial_daily_list_tpl" type="text/template">
[% if(it.length) { %]
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['id'] %]</td>
<td>[%= it[item]['house_id'] %]</td>
<td>[%= it[item]['house_address'] %]</td>
<td>[%= it[item]['type']%]</td>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['receipt_number'] %]</td>
<td>[%= it[item]['price'] %]</td> <td>[%= it[item]['price'] %]</td>
<td>[%= it[item]['pay_type']%]</td>
<td> <td>
<a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a> <a class="btn1 btn-info" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
</td> </td>
...@@ -139,3 +158,5 @@ ...@@ -139,3 +158,5 @@
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