财务日报 修改

application/index/view/finance/daily_details.html

@@ -423,7 +423,11 @@
             	                	<th class="text-center shenzhen">筠姐支付宝</th>
 									<th class="text-center shenzhen">筠姐微信</th>
 									<th class="text-center shenzhen">银满谷银行卡</th>
-            	                	<!--上海 杭州 店长 commit-->
+									<th class="text-center shenzhen">筠姐上海银行卡</th>
+									<th class="text-center shenzhen">POS机</th>
+									<th class="text-center shenzhen">世家公账</th>
+									
+            	                	<!--上海 店长 commit-->
 									<th class="text-center shanghai">施总支付宝</th>
 									<th class="text-center shanghai">林老师支付宝</th>
 									<th class="text-center shanghai">施总微信</th>
@@ -434,6 +438,23 @@
 									<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>
+									
+									<!--杭州 店长 commit-->
+									<th class="text-center hangzhou">施总支付宝</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>
+									<th class="text-center hangzhou">世家公账</th>
+									<th class="text-center hangzhou">3000账号</th>
+									<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">提交人</th>
 									<th class="text-center">提交时间</th>
@@ -451,7 +472,17 @@
 										<td class="text-center shenzhen">
 											<span id="pay_yun_card"></span>
 										</td>
-            	                	    <!--上海 杭州 店长 commit-->
+										<td class="text-center shenzhen">
+											<span id="pay_yun_bank"></span>
+										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_pos"></span>
+										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_family"></span>
+										</td>
+										
+            	                	    <!--上海 店长 commit-->
 										<td class="text-center shanghai">
 											<span id="pay_a"></span>
 										</td>
@@ -482,6 +513,52 @@
 										<td class="text-center shanghai">
 											<span id="pay_h"></span>
 										</td>
+										<td class="text-center shanghai">
+											<span id="pay_k"></span>
+										</td>
+										<td class="text-center shanghai">
+											<span id="pay_m"></span>
+										</td>
+										
+										<!--杭州 店长 commit-->
+										<td class="text-center hangzhou">
+											<span id="pay_a_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_a1_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_b_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_b1_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_c_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_d_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_e_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_f_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_g_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_h_hangzhou"></span>
+										</td>
+										<td class="text-center hangzhou">
+											<span id="pay_k_hangzhou"></span>
+										</td>
+										<td class="text-center shanghai">
+											<span id="pay_m_hangzhou"></span>
+										</td>
+										
+										
 										
 										<td class="text-center">
 											<span id="pay_i"></span>
@@ -506,6 +583,9 @@
 	            	                	<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>
 	            	                	<!--上海 杭州 total 财务-->
 										<th class="text-center shanghai">施总支付宝</th>
 										<th class="text-center shanghai">林老师支付宝</th>
@@ -517,6 +597,22 @@
 										<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>
+										<!--杭州 total 财务-->
+										<th class="text-center hangzhou">施总支付宝</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>
+										<th class="text-center hangzhou">世家公账</th>
+										<th class="text-center hangzhou">3000账号</th>
+										<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">审核人</th>
 										<th class="text-center">审核时间</th>
 										<th class="text-center">备注</th>
@@ -528,6 +624,7 @@
 								</tbody>
 								<tfoot class="text-center" id="maintable_list_total">
 										<tr>
+											<!--深圳-->
 											<td class="text-center shenzhen">
 												<span id="total_yun_zhihubao"></span>
 											</td>
@@ -537,7 +634,18 @@
 											<td class="text-center shenzhen">
 												<span id="total_yun_card"></span>
 											</td>
+											<td class="text-center shenzhen">
+											    <span id="total_yun_bank"></span>
+											</td>
+											<td class="text-center shenzhen">
+												<span id="total_yun_pos"></span>
+											</td>
+											<td class="text-center shenzhen">
+												<span id="total_yun_family"></span>
+											</td>
+											
 											
+											<!--上海-->
 											<td class="text-center shanghai">
 												<span id="total_a"></span>
 											</td>
@@ -568,6 +676,52 @@
 											<td class="text-center shanghai">
 												<span id="total_h"></span>
 											</td>
+											<td class="text-center shanghai">
+												<span id="total_m"></span>
+											</td>
+											<td class="text-center shanghai">
+												<span id="total_n"></span>
+											</td>
+											
+											<!--杭州-->
+											<td class="text-center hangzhou">
+												<span id="total_a_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_a1_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_b_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_b1_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_c_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_d_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_e_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_f_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_g_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_h_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_m_hangzhou"></span>
+											</td>
+											<td class="text-center hangzhou">
+												<span id="total_n_hangzhou"></span>
+											</td>
+											
+											
 											<td class="text-center">
 												<span id="total_i"></span>
 											</td>

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -176,7 +176,11 @@
     	<td class="shenzhen">[%= it[item]['alipay'] %]</td>
     	<td class="shenzhen">[%= it[item]['tenpay'] %]</td>
         <td class="shenzhen">[%= it[item]['bank_card'] %]</td>
-    	<!--上海 杭州-->
+        <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="shanghai">[%= it[item]['alipay'] %]</td>
     	<td class="shanghai">[%= it[item]['alipay_2'] %]</td>
         <td class="shanghai">[%= it[item]['tenpay'] %]</td>
@@ -187,6 +191,24 @@
         <td class="shanghai">[%= it[item]['cash'] %]</td>
         <td class="shanghai">[%= it[item]['pos'] %]</td>
         <td class="shanghai">[%= it[item]['other_bank'] %]</td>
+        <td class="shanghai">[%= it[item]['bank_card'] %]</td>
+        <td class="shanghai">[%= it[item]['bank_card_new'] %]</td>
+        
+        <!--杭州-->
+    	<td class="hangzhou">[%= it[item]['alipay'] %]</td>
+    	<td class="hangzhou">[%= it[item]['alipay_2'] %]</td>
+        <td class="hangzhou">[%= it[item]['tenpay'] %]</td>
+        <td class="hangzhou">[%= it[item]['tenpay_2'] %]</td>
+        <td class="hangzhou">[%= it[item]['realty_pay'] %]</td>
+        <td class="hangzhou">[%= it[item]['family_pay']%]</td>
+        <td class="hangzhou">[%= it[item]['private_bank'] %]</td>
+        <td class="hangzhou">[%= it[item]['cash'] %]</td>
+        <td class="hangzhou">[%= it[item]['pos'] %]</td>
+        <td class="hangzhou">[%= it[item]['other_bank'] %]</td>
+        <td class="hangzhou">[%= it[item]['bank_card'] %]</td>
+        <td class="hangzhou">[%= it[item]['bank_card_lin'] %]</td>
+        
+        
         
         <td>[%= it[item]['operation_name'] %]</td>
         <td>[%= it[item]['update_time'] %]</td>