Skip to content

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

优化

parent 6b2466ef
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 6 deletions
application/index/view/finance/daily_details.html
View file @ 546c44e1
...@@ -1181,6 +1181,28 @@ ...@@ -1181,6 +1181,28 @@
<span id="intoType" class="col-xs-6 ld-Marheight">中介费</span> <span id="intoType" class="col-xs-6 ld-Marheight">中介费</span>
</div> </div>
</div> </div>
<!--中介费类型 加被收取方-->
<div class="col-xs-12 agency_fees_type_hide hide_charge_side">
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-3 ld-Marheight" style="margin-left: -7px;">被收取方:</span></strong>
<div class="col-xs-6">
<select class="form-control" id="charge_side_detail">
<option class="" value="">请选择</option>
<option class="" value="1">房东</option>
<option class="" value="2">客户</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
</div>
</div>
</div>
<!--收款详情 加中介费类型 之前已收佣--> <!--收款详情 加中介费类型 之前已收佣-->
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-xs-6 agency_fees_type_hide"> <div class="col-xs-6 agency_fees_type_hide">
...@@ -1889,6 +1911,20 @@ ...@@ -1889,6 +1911,20 @@
</div> </div>
</div> </div>
</div> </div>
<!--收取方-->
<!--中介费类型 显示 被收取方-->
<div class="col-xs-6" id="agency_fees_type_div">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">被收取方:</span></strong>
<div class="col-xs-6">
<select class="form-control" id="charge_side">
<option class="" value="">请选择</option>
<option class="" value="1">房东</option>
<option class="" value="2">客户</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6" id="before_commission_div"> <div class="col-xs-6" id="before_commission_div">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">之前已收佣(元):</span></strong> <strong><span class="col-xs-4 ld-Marheight">之前已收佣(元):</span></strong>
......
application/index/view/officeBuilding/account_statement_shop.html
View file @ 546c44e1
...@@ -1267,7 +1267,7 @@ ...@@ -1267,7 +1267,7 @@
<div class="col-xs-12 beChargedPartyHide"> <div class="col-xs-12 beChargedPartyHide">
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-3 ld-Marheight">被收取方::</span></strong> <strong><span class="col-xs-3 ld-Marheight">被收取方:</span></strong>
<span id="beChargedParty" class="col-xs-6 ld-Marheight"></span> <span id="beChargedParty" class="col-xs-6 ld-Marheight"></span>
</div> </div>
</div> </div>
......
public/resource/js/agent.js
View file @ 546c44e1
...@@ -1268,7 +1268,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp ...@@ -1268,7 +1268,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
'agents_id': n.join(',') 'agents_id': n.join(',')
} }
$.ajax({ $.ajax({
url: '/index/agentEvaluateNumAndFraction', url: '/index/agentEvaluateNumAndFractionV2',
type: 'GET', type: 'GET',
async: true, async: true,
data: _data, data: _data,
...@@ -1277,8 +1277,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp ...@@ -1277,8 +1277,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'text!temp/phoneBinding_temp
if(data.code == 200 && data.data != null) { if(data.code == 200 && data.data != null) {
$("#agentlist tr").each(function(e) { $("#agentlist tr").each(function(e) {
//e代表索引 从0开始 eq(0)就是第一行 //e代表索引 从0开始 eq(0)就是第一行
$("#agentlist").find("tr").eq(e).find("td").eq(9).html(data.data[e].agent_evaluate_num); //获取一列的值 $("#agentlist").find("tr").eq(e).find("td").eq(9).html(data.data[e].evaluate_num); //获取一列的值
$("#agentlist").find("tr").eq(e).find("td").eq(10).html(data.data[e].agent_evaluate_fraction); $("#agentlist").find("tr").eq(e).find("td").eq(10).html(data.data[e].average_evaluate);
}) })
} }
} }
......
public/resource/js/financial_manager_daily_list.js
View file @ 546c44e1
...@@ -104,6 +104,15 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -104,6 +104,15 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
e.stopPropagation(); e.stopPropagation();
location.href='/index/dailyList' location.href='/index/dailyList'
}); });
//收款详情 隐藏 显示收取方
$("#intoType").change(function() {
if($('#intoType').val() == 91){
$('.hide_charge_side').show();
}else{
$('.hide_charge_side').hide();
};
});
//点击删除按钮 获取收款id //点击删除按钮 获取收款id
_doc.on('click', '.del-details', function(e) { _doc.on('click', '.del-details', function(e) {
e.preventDefault(); e.preventDefault();
...@@ -667,7 +676,6 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -667,7 +676,6 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$("#modal-back").on("hidden.bs.modal", function(event){ $("#modal-back").on("hidden.bs.modal", function(event){
$('#before_commission').val("0");//调整页面 之前已收佣 0 $('#before_commission').val("0");//调整页面 之前已收佣 0
$('#agency_fees_type').val("0");//调整页面 中介费 0 $('#agency_fees_type').val("0");//调整页面 中介费 0
$('#change_price').val("0"); $('#change_price').val("0");
$('#report_id_change').val(""); $('#report_id_change').val("");
$('#into_id_change').val(""); $('#into_id_change').val("");
...@@ -696,6 +704,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -696,6 +704,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$('#shop_id_change_shop').val(""); $('#shop_id_change_shop').val("");
$('#change_time').val(""); $('#change_time').val("");
$('.img_area').empty(); $('.img_area').empty();
$('#charge_side').val("");//调整页面 中介费 被收取方 空
}); });
$('#change_type').change(function(e){ $('#change_type').change(function(e){
...@@ -1733,6 +1743,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1733,6 +1743,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
doc.find("#comit_time").text(data.create_time); doc.find("#comit_time").text(data.create_time);
doc.find("#open_time").text(data.open_time);//开业确定时间 doc.find("#open_time").text(data.open_time);//开业确定时间
doc.find("#store_name").text(data.reckon_in_store_name);//所属门店 doc.find("#store_name").text(data.reckon_in_store_name);//所属门店
doc.find("#charge_side_detail").val(data.be_charged_party);//中介费 被收取方
//判断收款详情的类型 //判断收款详情的类型
if(data.type == 91){ if(data.type == 91){
...@@ -1946,6 +1958,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1946,6 +1958,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
//判断是否是 案场费 //判断是否是 案场费
if ($('#intoType').text() == '中介费'){ if ($('#intoType').text() == '中介费'){
params.type_ext = $('#agency_fees_type_text').val() params.type_ext = $('#agency_fees_type_text').val()
if($('#charge_side_detail').val()){
params.be_charged_party = $('#charge_side_detail').val();//收款详情 中介费 新增收取方
}else{
alert('收取方必填');
return;
}
}; };
//判断是否是 案场费 中介费 //判断是否是 案场费 中介费
if ($('#intoType').text() == '案场费' || $('#intoType').text() == '中介费'){ if ($('#intoType').text() == '案场费' || $('#intoType').text() == '中介费'){
...@@ -2084,6 +2102,13 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -2084,6 +2102,13 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
}; };
if($('#change_type').val() == 91){ if($('#change_type').val() == 91){
params.type_ext=$('#agency_fees_type').val(); params.type_ext=$('#agency_fees_type').val();
if($('#charge_side').val()){
params.be_charged_party=$('#charge_side').val();
}else{
alert('收取方必填');
return;
}
} }
//拼接jsonArray to jsonObject //拼接jsonArray to jsonObject
if ($('#change_price').val()){//调整金额 if ($('#change_price').val()){//调整金额
......
public/resource/template/fineMoney_list_template_tpl.html
View file @ 546c44e1
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<td class="text-center"> <td class="text-center">
[% if(it[item]["status"]*1 == 0 ){ %] [% if(it[item]["status"]*1 == 0 ){ %]
<a class="btn1 btn-info cancel-fine" data-id='[%= it[item]["id"] %]'>取消</a> <a class="btn1 btn-info cancel-fine" data-id='[%= it[item]["id"] %]'>取消</a>
<a class="btn1 btn-info complete-fine" data-id='[%= it[item]["id"] %]'>转到已支付</a> <!--<a class="btn1 btn-info complete-fine" data-id='[%= it[item]["id"] %]'>转到已支付</a>-->
[% } %] [% } %]
<a class="btn1 btn-info edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a> <a class="btn1 btn-info edit" href="#modal-edit" 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