1

public/resource/js/getCollection.js

@@ -1382,7 +1382,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 	 		doc.find("#realPrice").val(data.real_money);
 	 		//保留两位小数
 	 		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) + "元");
+	 		doc.find("#morePrice").text((Math.floor((data.money - ((data.price-0)*persent) + data.received_money*1 )*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

@@ -19,7 +19,7 @@
         <td>[%= it[item]['transaction_fee']%]</td>
         <td>[%= it[item]['received_money']%]</td>
         <td>[% if(it[item]["type_ext"] == 0) { %]
-        	[%= (it[item]['money']*1 - (it[item]['price']*0.7)).toFixed(2) %]
+        	[%= (it[item]['money']*1 + it[item]['received_money']*1 - (it[item]['price']*0.7)).toFixed(2) %]
 		[% }else{ %]
 			[%= (it[item]['money']*1 - 0).toFixed(2) %]
 		[% } %]