财务日报

application/index/view/finance/daily_details.html

@@ -540,7 +540,10 @@
 									<th class="text-center shanghai">上海银满谷银行卡</th>
 									<th class="text-center shanghai">新同联福居银行卡</th>
 									<th class="text-center shanghai">林老师建行卡</th>
-									
+									<!--在上海基础上 改北京的-->
+									<th class="text-center beijing">筠姐支付宝</th>
+									<th class="text-center beijing">筠姐微信</th>
+									<th class="text-center beijing">筠姐上海银行卡</th>
 									
 									
 									<!--杭州 店长 commit-->
@@ -633,6 +636,18 @@
 										<td class="text-center shanghai">
 											<span id="pay_lin"></span>
 										</td>
+										<!--在上海的基础上加北京-->
+										<td class="text-center beijing">
+											<span id="pay_a_bj"></span>
+										</td>
+										<td class="text-center beijing">
+											<span id="pay_b_bj"></span>
+										</td>
+										<td class="text-center beijing">
+											<span id="pay_c_bj"></span>
+										</td>
+										
+										
 										
 										<!--杭州 店长 commit-->
 										<td class="text-center hangzhou">
@@ -709,6 +724,9 @@
 										<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>
+										
 	            	                	<!--上海  total 财务-->
 										<th class="text-center shanghai">施总支付宝</th>
 										<th class="text-center shanghai">林老师支付宝</th>
@@ -724,6 +742,11 @@
 										<th class="text-center shanghai">新同联福居银行卡</th>
 										<th class="text-center shanghai">林老师建行卡</th>
 										
+										<!--在上海基础上 改北京的-->
+										<th class="text-center beijing">筠姐支付宝</th>
+										<th class="text-center beijing">筠姐微信</th>
+										<th class="text-center beijing">筠姐上海银行卡</th>
+										
 										<!--杭州 total 财务-->
 										<th class="text-center hangzhou">施总支付宝</th>
 										<th class="text-center hangzhou">林老师支付宝</th>
@@ -772,6 +795,12 @@
 											<td class="text-center shenzhen">
 												<span id="total_yun_family"></span>
 											</td>
+											<td class="text-center shenzhen">
+												<span id="total_yun_shenzheng_card"></span>
+											</td>
+											<td class="text-center shenzhen">
+												<span id="total_yun_lin"></span>
+											</td>
 											
 											
 											<!--上海-->
@@ -814,6 +843,18 @@
 											<td class="text-center shanghai">
 												<span id="total_lin"></span>
 											</td>
+											<!--上海的基础上 加北京-->
+											<td class="text-center beijing">
+												<span id="total_a_bj"></span>
+											</td>
+											<td class="text-center beijing">
+												<span id="total_b_bj"></span>
+											</td>
+											<td class="text-center beijing">
+												<span id="total_c_bj"></span>
+											</td>
+											
+											
 											
 											<!--杭州-->
 											<td class="text-center hangzhou">

application/index/view/officeBuilding/getCollectionOffice.html

@@ -915,6 +915,8 @@
 										<option value="74" class="shenzheng">陈志杰招商银行卡</option>	
 										<option value="41" class="shenzheng">世家公账</option>
 										<option value="30" class="shenzheng">pos机器</option>		
+										<option value="75" class="shenzheng">深圳银满谷银行卡</option>		
+										<option value="21" class="shenzheng">林老师微信</option>		
 										
 										
 

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -307,6 +307,8 @@
         <td class="shenzhen">[%= it[item]['bank_card_yun'] %]</td>
         <td class="shenzhen">[%= it[item]['pos'] %]</td>
         <td class="shenzhen">[%= it[item]['family_pay'] %]</td>
+        <td class="shenzhen">[%= it[item]['tenpay_2'] %]</td>
+        <td class="shenzhen">[%= it[item]['bank_card_sz'] %]</td>
     	<td class="shenzhen">[%= it[item]['alipay_3'] %]</td>
     	<td class="shenzhen">[%= it[item]['tenpay_3'] %]</td>
     	<td class="shenzhen">[%= it[item]['bank_card_chen'] %]</td>
@@ -329,6 +331,10 @@
         <td class="shanghai">[%= it[item]['alipay_3'] %]</td>
     	<td class="shanghai">[%= it[item]['tenpay_3'] %]</td>
     	<td class="shanghai">[%= it[item]['bank_card_chen'] %]</td>
+    	<!--在上海的基础上 加北京审核记录-->
+    	<td class="beijing">[%= it[item]['alipay'] %]</td>
+    	<td class="beijing">[%= it[item]['tenpay'] %]</td>
+    	<td class="beijing">[%= it[item]['bank_card_yun'] %]</td>
         
         <!--杭州-->
     	<td class="hangzhou">[%= it[item]['alipay'] %]</td>