财务日报

application/index/view/finance/daily_details.html

@@ -517,10 +517,12 @@
             	                	<!--深圳-->
             	                	<th class="text-center shenzhen">筠姐支付宝</th>
 									<th class="text-center shenzhen">筠姐微信</th>
-									<th class="text-center shenzhen">银满谷银行卡</th>
+									<th class="text-center shenzhen">上海银满谷银行卡</th>
 									<th class="text-center shenzhen">筠姐上海银行卡</th>
 									<th class="text-center shenzhen">POS机</th>
 									<th class="text-center shenzhen">世家公账</th>
+									<th class="text-center shenzhen">林老师微信</th>
+									<th class="text-center shenzhen">深圳银满谷银行卡</th>
 									
 									  
 									
@@ -535,7 +537,7 @@
 									<th class="text-center shanghai">现金</th>
 									<th class="text-center shanghai">POS机</th>
 									<th class="text-center shanghai">其他</th>
-									<th class="text-center shanghai">银满谷银行卡</th>
+									<th class="text-center shanghai">上海银满谷银行卡</th>
 									<th class="text-center shanghai">新同联福居银行卡</th>
 									<th class="text-center shanghai">林老师建行卡</th>
 									
@@ -552,7 +554,7 @@
 									<th class="text-center hangzhou">现金</th>
 									<th class="text-center hangzhou">POS机</th>
 									<th class="text-center hangzhou">其他</th>
-									<th class="text-center hangzhou">银满谷银行卡</th>
+									<th class="text-center hangzhou">上海银满谷银行卡</th>
 									<th class="text-center hangzhou">林老师建行卡</th>
 									
 									
@@ -584,6 +586,12 @@
 										<td class="text-center shenzhen">
 											<span id="pay_yun_family"></span>
 										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_shenzheng_card"></span>
+										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_lin"></span>
+										</td>
 										
             	                	    <!--上海 店长 commit-->
 										<td class="text-center shanghai">

public/resource/js/financial_manager_daily_list.js

@@ -1000,6 +1000,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 									    $('#pay_yun_bank').html(data.data.commit_info.bank_card_yun);
 									    $('#pay_yun_pos').html(data.data.commit_info.pos);
 									    $('#pay_yun_family').html(data.data.commit_info.family_pay);
+									    $('#pay_yun_family').html(data.data.commit_info.family_pay);//深圳银满谷
+									    $('#pay_yun_family').html(data.data.commit_info.tenpay_2);//林老师微信
 									    
 									    $('.shenzhen').show();
 									    $('.shanghai').hide();
@@ -2444,7 +2446,7 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 	return bargain;
 });
 
-var sw=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 12:return"筠姐支付宝";case 13:return"陈志杰支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 22:return"筠姐微信";case 23:return"陈志杰微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";case 70:return"银满谷银行卡";case 71:return"筠姐上海银行卡";case 72:return"林老师建行卡";case 73:return"新同联福居银行卡";case 74:return"陈志杰招商银行卡";default:return s}}; 
+var sw=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 12:return"筠姐支付宝";case 13:return"陈志杰支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 22:return"筠姐微信";case 23:return"陈志杰微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";case 70:return"上海银满谷银行卡";case 71:return"筠姐上海银行卡";case 72:return"林老师建行卡";case 73:return"新同联福居银行卡";case 74:return"陈志杰招商银行卡";case 75:return"深圳银满谷银行卡";default:return s}}; 
 
 var swtype=function(s){switch(Number(s)){case 1:return"意向金转中介费";case 2:return"意向金转案场费";case 3:return"意向金转意向金";case 4:return"保管金转中介费";case 5:return"保管金转案场费";case 6:return"保管金转保管金";case 7:return"意向金转保管金";default:return s}};