Skip to content

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

收款修改

parent c4819421
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 15 deletions
application/index/view/finance/getCollection.html
View file @ 41a19163
{layout name="global/frame_two_tpl" /} {layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="getCollection" /> <input type="hidden" class="page-load" id="getCollection" />
<style> <style>
.reportAreaLiu{
list-style: none;
}
.col-xs-3{ .col-xs-3{
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
...@@ -660,6 +663,7 @@ ...@@ -660,6 +663,7 @@
<div class="form-group"> <div class="form-group">
<strong><span>成交报告ID:</span></strong> <strong><span>成交报告ID:</span></strong>
<span id="chengjiaobaogaoId">45122</span> <span id="chengjiaobaogaoId">45122</span>
<a class="btn btn-info btn-small modifyReport" href="#modifyReport_modal" data-toggle="modal">修改</a>
</div> </div>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
...@@ -1195,4 +1199,57 @@ ...@@ -1195,4 +1199,57 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
\ No newline at end of file
<!-- /#修改成交报告id -->
<div class="modal fade" id="modifyReport_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" style="width: 800px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">
修改成交报告ID
</h4>
</div>
<div class="modal-body" style="overflow: hidden;">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">成交报告ID:</span></strong>
<div class="col-xs-9" style="padding:0px 10px 0px 5px;">
<input class="form-control" type="text" value="" id="report_id_change_liu" data-status="200" autocomplete="off" />
<ul class="reportAreaLiu" style="display:none" data-status="100" ></ul></div>
</div>
</div>
<div class="col-xs-12" >
<div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">带看订单ID:</span></strong>
<span id="into_id_change_liu" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">商铺ID:</span></strong>
<span id="shop_id_change_liu" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">商铺地址:</span></strong>
<span id="shop_addr_change_liu" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" id="modify_report_id" data-dismiss="modal">
保存
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
application/index/view/houses/houseList.html
View file @ 41a19163
...@@ -371,6 +371,7 @@ ...@@ -371,6 +371,7 @@
<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>
......
public/appnew/src/components/advertisingPage/advertisingPage.vue
View file @ 41a19163
<template> <template>
<div class="bg-advertising"> <div>
<div style="font-size: 18px;line-height: 30px;">宝山区的万达广场将于 2019.2.3开盘,请各位小伙伴加油鸭!</div>
<div style="font-size: 14px;color:rgba(153,153,153,1);">
<span style="color:rgba(80,185,252,1);background:rgba(105,166,255,.1);display: inline-block;padding: 5px;margin-right: 10px;">上海</span>
<span style="color:rgba(255,128,24,1);background:rgba(255,128,24,.1);display: inline-block;padding: 5px;">一部</span>
<span style="margin-right: 10px;">209周小雨</span>
<span>2018-6-12 12:00:00</span>
</div>
</div> </div>
</template> </template>
...@@ -27,10 +34,4 @@ ...@@ -27,10 +34,4 @@
} }
</script> </script>
<style scoped> <style scoped>
.bg-advertising{
width: 100%;
height: 24.44rem;
background: url(images/bgAdvertising@2x.png) no-repeat 0 0/100% 24.44rem;
}
</style> </style>
public/resource/js/getCollection.js
View file @ 41a19163
...@@ -29,6 +29,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -29,6 +29,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
payment_details_price:'', payment_details_price:'',
payment_details_money:'', payment_details_money:'',
receivedMoneyLiu:'', receivedMoneyLiu:'',
bargain_id_liu:'',
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template); $(document.body).append(template);
...@@ -418,6 +419,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -418,6 +419,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$('#savePayBtn').click(function(){ $('#savePayBtn').click(function(){
that.saveRecervables(); that.saveRecervables();
});
//保存成交报告id
$('#modify_report_id').click(function(){
that.saveRecervables();
}) })
$("#modal-back").on("hidden.bs.modal", function(event){ $("#modal-back").on("hidden.bs.modal", function(event){
...@@ -517,6 +522,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -517,6 +522,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
that.search_phone(); that.search_phone();
} }
}); });
//成交报告搜索 收款详情
$(document).on("input", "#report_id_change_liu", function() {
receiv.bargain_id_liu = $("#report_id_change_liu").val();
if($("#report_id_change_liu").val() == '') {
var tag = "";
$('#reportArea').append(tag);
} else {
that.search_phone_liu();
}
});
//成交报告搜索 收款详情 置空
$(document).on("click", ".modifyReport", function() {
$('#report_id_change_liu').val('');
$('#into_id_change_liu').html('');
$('#shop_id_change_liu').html('');
$('#shop_addr_change_liu').html('');
});
//带看id搜索 //带看id搜索
$(document).on("input", "#into_id_change", function() { $(document).on("input", "#into_id_change", function() {
...@@ -538,7 +560,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -538,7 +560,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$(document).delegate(".intoIdBuild", "click", function() { $(document).delegate(".intoIdBuild", "click", function() {
that.intoIdBuild(this); that.intoIdBuild(this);
}); });
//收款详情 点击li 列表消失
$(document).delegate(".reportIdBuildLiu", "click", function() {
that.reportIdBuildLiu(this);
});
//点击li 列表消失 //点击li 列表消失
$(document).delegate(".addphone", "click", function() { //list消失新增客户 点击li事件 获取id ul消失 $(document).delegate(".addphone", "click", function() { //list消失新增客户 点击li事件 获取id ul消失
...@@ -729,7 +754,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -729,7 +754,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
that.agent_id = $(obj).attr("data-agent_id"); that.agent_id = $(obj).attr("data-agent_id");
that.agent_name = $(obj).attr("data-agent_name"); that.agent_name = $(obj).attr("data-agent_name");
}, },
//将li里的值 赋给input（分佣方姓名）(收款详情)
reportIdBuildLiu: function(obj) {//新增客户 input赋值
$(".reportAreaLiu").html('');
$('.reportAreaLiu').hide();
$('#into_id_change_liu').html($(obj).attr("data-order_id"));
$('#shop_id_change_liu').html($(obj).attr("data-house_id"));
$('#shop_addr_change_liu').html($(obj).attr("data-addr"));
},
search_phone : function(){ search_phone : function(){
var that = receiv ; var that = receiv ;
$.ajax({ $.ajax({
...@@ -766,7 +799,43 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -766,7 +799,43 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
} }
}); });
}, },
//收款详情 成交报告搜索
search_phone_liu : function(){
var that = receiv ;
$.ajax({
url: '/broker/bargainMain',
type: 'GET',
async: true,
data: {
// "keyword": $("#report_id_change").val(),
"bargain_id": $("#report_id_change_liu").val(),
'status' : 0,
'is_my_correlation' : 0,
'page_no' : 1,
'page_size' : 20 ,
'AuthToken' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).AuthToken,
// 'submit_agent_id' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id
'submit_agent_id' : 0
},
dataType: 'json',
success: function(data) {
if(data.code == 200) {
var user_ul = "";
$.each(data.data.result, function(i, item) {
user_ul += '<li class="reportIdBuildLiu" data-house_id="'+item.house_id+'" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id
+'" data-agent_id="' + item.agent_id +'" data-order_no="' + item.order_no +'" data-agent_id="' + item.agent_id +'" data-agent_id="' + item.agent_id+'" data-report_id="'+item.report_id
+'" data-addr="'+item.internal_address+'" data-id="' + item.id + '">'
+ item.internal_address + ',商铺ID：' + item.house_id + '，成交报告ID' + item.id + '，成交价：' + item.price + '，佣金'+ item.commission +'</li>';
});
$('.reportAreaLiu').show();
$(".reportAreaLiu").html(user_ul);
} else {
alert(data.msg);
}
}
});
},
search_into : function(){ search_into : function(){
var that = receiv ; var that = receiv ;
$.ajax({ $.ajax({
...@@ -1053,7 +1122,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1053,7 +1122,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
var params = that.recervablesParams(); var params = that.recervablesParams();
$.post('/index/getCollectionEdit',params,function(data){ $.post('/index/getCollectionEdit',params,function(data){
if(data.code == 200) { if(data.code == 200) {
that.getList(that.pageNo); that.getList(that.pageNo);//优化
that.getMoneyDetail(house_fatherid);
that.getaddPicList(house_fatherid);
that.getMoneyDetail(id);
} else { } else {
alert(data.msg); alert(data.msg);
} }
...@@ -1062,6 +1135,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1062,6 +1135,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
recervablesParams : function(){ recervablesParams : function(){
var params = {} ; var params = {} ;
if (receiv.bargain_id_liu){//收款详情 成交报告id
params.bargain_id = receiv.bargain_id_liu;
};
// params.bargain_id = receiv.bargain_id_liu;
if ($('#intoType').val()){//入账类型 if ($('#intoType').val()){//入账类型
params.type = $('#intoType').val() params.type = $('#intoType').val()
}; };
...@@ -1095,9 +1172,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1095,9 +1172,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if ($('#lastTime').val()){//最后转定时间 if ($('#lastTime').val()){//最后转定时间
params.last_transfer_time = $('#lastTime').val() params.last_transfer_time = $('#lastTime').val()
}; };
if ($('#chengjiaobaogaoId').html()){//收款详情 成交报告id
params.bargain_id = $('#chengjiaobaogaoId').html();
};
if ( $('#intoType').val() == 10 || $('#intoType').val() == 30) { if ( $('#intoType').val() == 10 || $('#intoType').val() == 30) {
if ( $('#shoutiao').val()){ if ( $('#shoutiao').val()){
params.receipt_number = $('#shoutiao').val() params.receipt_number = $('#shoutiao').val()
...@@ -1355,6 +1429,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1355,6 +1429,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
doc.find("#ruzhangId").text(data.id); doc.find("#ruzhangId").text(data.id);
doc.find("#dingdanId").text(data.order_id); doc.find("#dingdanId").text(data.order_id);
doc.find("#chengjiaobaogaoId").text(data.bargain_id); doc.find("#chengjiaobaogaoId").text(data.bargain_id);
receiv.bargain_id_liu = data.bargain_id;
doc.find("#fangyuanId").text(data.house_id); doc.find("#fangyuanId").text(data.house_id);
doc.find("#tijiaoren").text(data.agent_name); doc.find("#tijiaoren").text(data.agent_name);
doc.find("#address").text(data.address); doc.find("#address").text(data.address);
......
public/resource/template/house_template_tpl.html
View file @ 41a19163
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
[%= it[item]["rent_price"] / 100 %] 元/月/㎡ [%= it[item]["rent_price"] / 100 %] 元/月/㎡
[% } %] [% } %]
</td> </td>
<td>[%='转让费' %]</td>
<td> <td>
[% if(it[item]["shop_type"] == 0) { %] [% if(it[item]["shop_type"] == 0) { %]
[%= it[item]["shop_area_start"] + '-' + it[item]["shop_area_end"] %]㎡ [%= it[item]["shop_area_start"] + '-' + it[item]["shop_area_end"] %]㎡
......
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