Merge branch 'test'

public/resource/js/getCollection.js

@@ -1284,6 +1284,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		},
 		
 		getValueFunction : function(data){
+			var persent = 70% ; 
 			$('.zhzd').show();
 			$('.zjcon').hide();
 			var doc = $('#modal-addPic');
@@ -1325,6 +1326,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				doc.find("#intoType").text('佣金');
 			} else if ( data.type == 91 ) {
 				doc.find("#intoType").text('中介费');
+				if ( doc.find('#agency_fees_type').val() == 1 ){
+					persent = 0 ;
+				}
 				$('.zhzd').hide();
 			} else if ( data.type == 92 ) {
 				doc.find("#intoType").text('案场费');
@@ -1343,8 +1347,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 	 		doc.find("#shouxu").val(data.transaction_fee);
 	 		doc.find("#realPrice").val(data.real_money);
 	 		//保留两位小数
-	 		doc.find("#getPrice").text((Math.floor(((data.price-0)*0.7 )*100)/100).toFixed(2)+ "元");
-	 		doc.find("#morePrice").text((Math.floor((data.money - ((data.price-0)*0.7))*100)/100).toFixed(2) + "元");
+	 		doc.find("#getPrice").text((Math.floor(((data.price-0)*persent )*100)/100).toFixed(2)+ "元");
+	 		doc.find("#morePrice").text((Math.floor((data.money - ((data.price-0)*persent))*100)/100).toFixed(2) + "元");
 	 		$("#person").text(data.current_agent_name);
 	 		$("#belongT").text(data.store_name);
 	 		doc.find("#payType").val(data.pay_type);

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -8,10 +8,20 @@
         <td>[%= it[item]['bargain_id'] %]</td>
         <td>[%= it[item]['house_address'] %]</td>
         <td>[%= it[item]['price']%]</td>
-        <td>[%= (it[item]['price']*0.7).toFixed(2) %]</td>
+        <td>[% if(it[item]["type_ext"] == 0) { %]
+        	[%= (it[item]['price']*0.7).toFixed(2) %]
+		[% }else{ %]
+			0
+		[% } %]
+		</td>
         <td>[%= it[item]['money']%]</td>
         <td>[%= it[item]['received_money']%]</td>
-        <td>[%= (it[item]['money']*1 - (it[item]['price']*0.7)).toFixed(2) %]</td>
+        <td>[% if(it[item]["type_ext"] == 0) { %]
+        	[%= (it[item]['money']*1 - (it[item]['price']*0.7)).toFixed(2) %]
+		[% }else{ %]
+			[%= (it[item]['money']*1 - 0).toFixed(2) %]
+		[% } %]
+		</td>
         <td>[%= sw(it[item]['pay_type'])%]</td>
 		<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
         <td>[%= it[item]['agent_name'] %]</td>