1

application/index/view/finance/getCollection.html

@@ -437,7 +437,6 @@
 						<div class="col-xs-12">
 								<span>该笔收款可调整/退款金额：<strong><span id="could_price">1000</span></strong>元</span>
 						</div>
-						
 						<div class="col-xs-6">
 							<div class="form-group">
 								<strong><span class="col-xs-4 ld-Marheight">调整为:</span></strong>

public/resource/js/getCollection.js

@@ -166,12 +166,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				var type = e.target.dataset.type ;
 				var order_id = e.target.dataset.order_id ;
 				that.type_num = e.target.dataset.type_num
-				that.order_id = order_id ;
-				that.order_no = e.target.dataset.order_no ; 
-				that.report_id = e.target.dataset.report_id;
-				that.agent_id = e.target.dataset.agent_id;
+//				that.order_id = order_id ;
+//				that.order_no = e.target.dataset.order_no ; 
+//				that.report_id = e.target.dataset.report_id;
+//				that.agent_id = e.target.dataset.agent_id;
 				that.pay_type = e.target.dataset.pay_type;
-				that.income_time = e.target.dataset.income_time
+				that.income_time = e.target.dataset.income_time;
 				that.getAllPrice(id);
 				if ( type == "意向金" ){
 					$('#change_type').val(91);
@@ -385,7 +385,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			$('#shop_id_change').text($(obj).attr("data-house_id"));
 			that.houseNmuber = $(obj).attr("data-house_number");
 			$('#into_id_change').attr("readonly","readonly");
-			$('#into_id_change').val($(obj).attr("data-order_id"))
+			$('#into_id_change').val($(obj).attr("data-order_id"));
+			$('#order_id_report').val($(obj).attr("data-order_id"));
+			that.order_id = $(obj).attr("data-order_id") ;
+			that.order_no = $(obj).attr("data-order_no") ; 
+			that.report_id = $(obj).attr("data-report_id");
+			that.agent_id = $(obj).attr("data-agent_id");
 		},
 		
 		search_phone : function(){
@@ -410,7 +415,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 					if(data.code == 200) {
 						var user_ul = "";
 						$.each(data.data.result, function(i, item) {
-							user_ul += '<li class="reportIdBuild" data-house_id="'+item.house_id+'" data-house_number="'+item.house_number+'"data-order_id="'+item.order_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>';
+							user_ul += '<li class="reportIdBuild" 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>';
 						});
 						$('.reportArea').show();
 						$(".reportArea").html(user_ul);

public/resource/template/receivables_template_tpl.html

@@ -30,11 +30,8 @@
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
             <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>
              [% if( it[item]['type_num'] == 10 || it[item]['type_num'] == 30 ) { %]
-            <a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-order_id='[%= it[item]['order_id'] %]' 
-            	data-agent_id = '[%= it[item]['agent_id'] %]' data-report_id='[%= it[item]['report_id'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]' 
-            	data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]' 
-            	data-industry_type='[%= it[item]['industry_type'] %]' data-report='[%= it[item]['report_id'] %]' data-order_no = '[%= it[item]['order_no'] %]'
-            	data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'>调整</a>
+            <a class="btn1 btn-success money_change" href="#modal-linetime" data-toggle="modal" data-type='[%= it[item]['type'] %]' data-id='[%= it[item]["id"]%]'
+            	data-type_num = '[%= it[item]['type_num'] %]' data-income_time='[%= it[item]['income_time'] %]' data-pay_type='[%= it[item]['pay_type_num'] %]'  >调整</a>
             [% } %]
            <!--<a class="btn1 btn-success money_back" href="#modal-back" data-toggle="modal" data-id='[%= it[item]["id"]%]'>退款</a>-->
             <a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>删除</a>