1

application/index/view/finance/getCollection.html

@@ -711,10 +711,8 @@
 								<span id="belongT" class=" col-xs-6 ld-Marheight"></span>
 							</div>
 						</div>
-						
 					</div>
 					
-					
 					<div class="col-xs-12">
 						<div class="col-xs-6">
 							<div class="form-group">
@@ -725,6 +723,14 @@
 								</div>
 							</div>
 						</div>
+						<div class="col-xs-6 shout">
+							<div class="form-group">
+								<strong><span class="col-xs-3 ld-Marheight">收条编号:</span></strong>
+								<div class="col-xs-6">
+									<input class="form-control" type="text" value="" id="shoutiao" />
+								</div>
+							</div>
+						</div>
 					</div>
 					<div class="col-xs-12">
 						<div class="col-xs-6">

public/resource/js/getCollection.js

@@ -171,6 +171,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				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.getAllPrice(id);
 				if ( type == "意向金" ){
 					$('#change_type').val(91);
@@ -574,7 +575,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				'order_no' : that.order_no,
 				'agent_id' : that.agent_id,
 				'report_id' : that.report_id_a ? that.report_id_a : that.report_id,
-				'industry_type' : that.yetai
+				'industry_type' : that.yetai,
+				'income_time' : that.income_time 
 			};
 			
 			var obj = {
@@ -687,6 +689,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			if ($('#lastTime').val()){//最后转定时间
 				params.last_transfer_time = $('#lastTime').val()
 			};	
+			if ( $('#intoType').text() == '意向金' || $('#intoType').text() == '保管金') {
+				if ( $('#shoutiao').val()){
+					params.receipt_number = $('#shoutiao').val()
+				}
+			}
 			return params ; 
 		},
 		
@@ -939,8 +946,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 	 		}
 	 		if ( data.type == 10 || data.type == 30) {
  				$('.ky').hide();
+ 				$('.shout').show();
  			} else {
  				$('.ky').show();
+ 				$('.shout').hide();
  			}
 		},
 		/**

public/resource/template/receivables_template_tpl.html

@@ -32,7 +32,7 @@
              [% 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-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>
             [% } %]