修改

public/resource/js/getCollection.js

@@ -30,6 +30,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		payment_details_money:'', 
 		receivedMoneyLiu:'', 
 		bargain_id_liu:'',
+		collection_id_liu:'',
+		is_baocun_bargainID:0,
+		liu_order_id:'',
+		liu_report_id:'',
 		init: function() {
 			//初始化dot
 			$(document.body).append(template);
@@ -328,6 +332,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			$(document).on('click','.add-pic',function(e){
 				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.house_fatherid = id;
 				//获取图片
@@ -418,10 +425,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			});
 			
 			$('#savePayBtn').click(function(){
+				receiv.is_baocun_bargainID = 0;
 				that.saveRecervables();
 			});
 			//保存成交报告id
 			$('#modify_report_id').click(function(){
+				receiv.is_baocun_bargainID = 1;
 				that.saveRecervables();
 			})
 			
@@ -758,6 +767,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		reportIdBuildLiu: function(obj) {//新增客户 input赋值
 			$(".reportAreaLiu").html('');
 			$('.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"));
 			$('#shop_id_change_liu').html($(obj).attr("data-house_id"));
 			$('#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',
 				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
@@ -1122,11 +1135,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			var params = that.recervablesParams();
 			$.post('/index/getCollectionEdit',params,function(data){
 				if(data.code == 200) {
-					that.getList(that.pageNo);//优化
-					that.getMoneyDetail(house_fatherid);
-					that.getaddPicList(house_fatherid);
+					if(receiv.is_baocun_bargainID*1 == 0){//判断点击的是哪个 保存详情的按钮
+					   that.getList(that.pageNo);
+					}else{
+						that.getMoneyDetail(receiv.collection_id_liu);
+					    that.getaddPicList(receiv.collection_id_liu);
+					}
 					
-				that.getMoneyDetail(id);
                 } else {
                 	alert(data.msg);
                 }
@@ -1135,6 +1150,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		
 		recervablesParams : function(){
 			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
 				params.bargain_id = receiv.bargain_id_liu;
 			};

public/resource/template/receivables_template_tpl.html

@@ -33,7 +33,7 @@
         <td>
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
         	[% 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( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]