Merge branch '1210-v3.0.2' into test

application/index/view/finance/getCollection.html

@@ -520,8 +520,8 @@
 						<div class="col-xs-6 choose_topic_2">
 							<div class="form-group">
 								<strong><span class="col-xs-4 ld-Marheight">商铺号:</span></strong>
-								<span id="shop_id_change_shop" class="col-xs-6 ld-Marheight"></span>
-								<!--<div class="col-xs-6"><input class="form-control"  type="text" value="" id="" /></div>-->
+								<!--<span id="shop_id_change_shop" class="col-xs-6 ld-Marheight"></span>-->
+								<div class="col-xs-6"><input class="form-control"  type="text" value="" id="shop_id_change_shop" /></div>
 							</div>
 						</div>
 						<div class="col-xs-6 choose_topic_2">

public/resource/js/getCollection.js

@@ -256,7 +256,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				$('#into_id_change').val("");
 				$('#shop_id_change').text("");
 				$('#shop_addr_change').text("");
-				$('#shop_id_change_shop').text("");
+				$('#shop_id_change_shop').val("");
 				$('#change_fenhong').val("");
 				$('#change_time').val("");
 				$('.img_area').empty();
@@ -493,7 +493,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			$(".reportArea").html('');
 			$('.reportArea').hide();
 			$('#shop_addr_change').text($(obj).attr("data-addr"));
-			$('#shop_id_change_shop').text($(obj).attr("data-house_number"));
+			$('#shop_id_change_shop').val($(obj).attr("data-house_number"));
 			$('#shop_id_change').text($(obj).attr("data-house_id"));
 			that.houseNmuber = $(obj).attr("data-house_number");
 			$('#into_id_change').attr("readonly","readonly");
@@ -563,7 +563,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 					if(data.code == 200) {
 						var user_ul = "";
 						$.each(data.data, function(i, item) {
-							user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_number+'"data-order_id="'+item.order_id+'" data-addr="'+item.house_address+'" data-id="' + item.report_id
+							user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_number+'"data-order_id="'+item.id+'" data-addr="'+item.house_address+'" data-id="' + item.report_id
 							+'" data-house_id="' + item.house_id +'" data-agent_id="' + item.report_agent_id +'" data-agent_name="' + item.report_agent_name +'" data-order_no="' + item.order_no
 							+ '">' + item.house_address + ',商铺ID:' + item.house_id + '，带看ID:' + item.report_id+'，客户编号:' + item.user_id+'</li>';
 						});
@@ -745,7 +745,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
              
 //           if ( $('#change_type').val() == 10 || $('#change_type').val() == 30)
 			//条件验证
-			params.house_number = that.houseNmuber;
+			params.house_number = $('#shop_id_change_shop').val()
 			if ( $('#change_type').val() == 10 || $('#change_type').val() == 30 ){
 				if ($('#change_time').val()){//最后转定时间
 					params.last_transfer_time = $('#change_time').val()