Commit 1cd1dc6d authored by agping's avatar agping

修改

parent 3c56d8e1
...@@ -30,6 +30,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -30,6 +30,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
payment_details_money:'', payment_details_money:'',
receivedMoneyLiu:'', receivedMoneyLiu:'',
bargain_id_liu:'', bargain_id_liu:'',
collection_id_liu:'',
is_baocun_bargainID:0,
liu_order_id:'',
liu_report_id:'',
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template); $(document.body).append(template);
...@@ -328,6 +332,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -328,6 +332,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$(document).on('click','.add-pic',function(e){ $(document).on('click','.add-pic',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
//获取收款详情单条数据 //获取收款详情单条数据
receiv.collection_id_liu = id;
receiv.liu_order_id = $(this).attr('data-order');
receiv.liu_report_id = $(this).attr('data-report');
that.getMoneyDetail(id); that.getMoneyDetail(id);
that.house_fatherid = id; that.house_fatherid = id;
//获取图片 //获取图片
...@@ -418,10 +425,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -418,10 +425,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
}); });
$('#savePayBtn').click(function(){ $('#savePayBtn').click(function(){
receiv.is_baocun_bargainID = 0;
that.saveRecervables(); that.saveRecervables();
}); });
//保存成交报告id //保存成交报告id
$('#modify_report_id').click(function(){ $('#modify_report_id').click(function(){
receiv.is_baocun_bargainID = 1;
that.saveRecervables(); that.saveRecervables();
}) })
...@@ -758,6 +767,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -758,6 +767,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
reportIdBuildLiu: function(obj) {//新增客户 input赋值 reportIdBuildLiu: function(obj) {//新增客户 input赋值
$(".reportAreaLiu").html(''); $(".reportAreaLiu").html('');
$('.reportAreaLiu').hide(); $('.reportAreaLiu').hide();
//更新reportid orderid
receiv.liu_report_id = $(obj).attr("data-report_id");
receiv.liu_order_id = $(obj).attr("data-order_id");
$('#into_id_change_liu').html($(obj).attr("data-order_id")); $('#into_id_change_liu').html($(obj).attr("data-order_id"));
$('#shop_id_change_liu').html($(obj).attr("data-house_id")); $('#shop_id_change_liu').html($(obj).attr("data-house_id"));
$('#shop_addr_change_liu').html($(obj).attr("data-addr")); $('#shop_addr_change_liu').html($(obj).attr("data-addr"));
...@@ -820,6 +832,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -820,6 +832,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
var user_ul = ""; var user_ul = "";
$.each(data.data.result, function(i, item) { $.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 user_ul += '<li class="reportIdBuildLiu" data-house_id="'+item.house_id+'" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id
...@@ -1122,11 +1135,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1122,11 +1135,13 @@ 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);//优化 if(receiv.is_baocun_bargainID*1 == 0){//判断点击的是哪个 保存详情的按钮
that.getMoneyDetail(house_fatherid); that.getList(that.pageNo);
that.getaddPicList(house_fatherid); }else{
that.getMoneyDetail(receiv.collection_id_liu);
that.getaddPicList(receiv.collection_id_liu);
}
that.getMoneyDetail(id);
} else { } else {
alert(data.msg); alert(data.msg);
} }
...@@ -1135,6 +1150,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -1135,6 +1150,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
recervablesParams : function(){ recervablesParams : function(){
var params = {} ; var params = {} ;
if (receiv.liu_report_id){
params.report_id = receiv.liu_report_id;
};
if (receiv.liu_order_id){
params.order_id = receiv.liu_order_id;
};
if (receiv.bargain_id_liu){//收款详情 成交报告id if (receiv.bargain_id_liu){//收款详情 成交报告id
params.bargain_id = receiv.bargain_id_liu; params.bargain_id = receiv.bargain_id_liu;
}; };
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<td> <td>
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
[% if(check_auth('index/getCollectionDetail')) { %] [% if(check_auth('index/getCollectionDetail')) { %]
<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a> <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-report='[%= it[item]["report_id"] %]' data-order='[%= it[item]["order_id"] %]'>收款详情</a>
[% } %] [% } %]
[% if(check_auth('index/getAdjustment')) { %] [% if(check_auth('index/getAdjustment')) { %]
[% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %] [% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]
......
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