优化

application/index/view/finance/daily_details.html

@@ -521,8 +521,8 @@
 									<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>
+									<th class="text-center shenzhen">林老师微信</th>
 									
 									  
 									
@@ -724,8 +724,8 @@
 										<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>
+										<th class="text-center shenzhen">林老师微信</th>
 										
 	            	                	<!--上海  total 财务-->
 										<th class="text-center shanghai">施总支付宝</th>

application/index/view/officeBuilding/account_statement_office.html

@@ -1193,7 +1193,8 @@
 										<option value="41">世家公账</option>
 										<option value="42">3000账号</option>
 										<option value="50">现金</option>
-										<option value="70">银满谷银行卡</option>
+										<option value="70">上海银满谷银行卡</option>
+										<option value="75">深圳银满谷银行卡</option>
 										<option value="60">其他</option>
 									</select>
 								</div>
@@ -1365,6 +1366,7 @@
 									<option value="13">陈志杰支付宝</option>	
 									<option value="23">陈志杰微信</option>	
 									<option value="74">陈志杰招商银行卡</option>
+									
 							</select>
 						</td>
 						<td>

application/index/view/officeBuilding/account_statement_shop.html

@@ -1202,7 +1202,8 @@
 										<option value="41">世家公账</option>
 										<option value="42">3000账号</option>
 										<option value="50">现金</option>
-										<option value="70">银满谷银行卡</option>
+										<option value="70">上海银满谷银行卡</option>
+										<option value="75">深圳银满谷银行卡</option>
 										<option value="60">其他</option>
 									</select>
 								</div>
@@ -1366,7 +1367,7 @@
 									<option value="41">世家公账</option>
 									<option value="42">3000账号</option>
 									<option value="50">现金</option>
-									<option value="70">银满谷银行卡</option>
+									<option value="70">上海银满谷银行卡</option>
 									<option value="71">筠姐上海银行卡</option>
 									<option value="72">林老师建行卡</option>
 									<option value="73">新同联福居银行卡</option>
@@ -1374,6 +1375,8 @@
 									<option value="13">陈志杰支付宝</option>	
 									<option value="23">陈志杰微信</option>	
 									<option value="74">陈志杰招商银行卡</option>
+									<option value="75">深圳银满谷银行卡</option>
+									
 							</select>
 						</td>
 						<td>

application/index/view/pay_log/delFinanceReport.html

@@ -358,7 +358,7 @@
 									<tr>
 										<td colspan="15">
 											<form id="form_search">
-
+													<span class="btn btn-success btn3 search" id="maintable_search" style="float: right;margin-right: 20px;">刷新</span>
 											</form>
 										</td>
 									</tr>

application/index/view/pay_log/intentions_warning.html

@@ -822,9 +822,8 @@
 										<option value="23" class="shanghai">陈志杰微信</option>
 										<option value="72" class="shanghai">林老师建行卡</option>		
 										<option value="30" class="shanghai">pos机器</option>		
-										<!--<option value="40" class="shanghai">地产转账</option>-->	
 										<option value="42" class="shanghai">3000账号</option>
-										<option value="70" class="shanghai">银满谷银行卡</option>		
+										<option value="70" class="shanghai">上海银满谷银行卡</option>		
 										<option value="73" class="shanghai">新同联福居银行卡</option>
 										<option value="74" class="shanghai">陈志杰招商银行卡</option>	
 										<option value="41" class="shanghai">世家公账</option>
@@ -849,8 +848,26 @@
 										<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>
+										
+										
+										<option value="10" class="beijing">施总支付宝</option>		
+										<option value="11" class="beijing">林老师支付宝</option>
+										<option value="13" class="beijing">陈志杰支付宝</option>	
+										<option value="20" class="beijing">施总微信</option>		
+										<option value="21" class="beijing">林老师微信</option>
+										<option value="23" class="beijing">陈志杰微信</option>
+										<option value="72" class="beijing">林老师建行卡</option>		
+										<option value="30" class="beijing">pos机器</option>		
+										<option value="42" class="beijing">3000账号</option>
+										<option value="70" class="beijing">上海银满谷银行卡</option>		
+										<option value="73" class="beijing">新同联福居银行卡</option>
+										<option value="74" class="beijing">陈志杰招商银行卡</option>	
+										<option value="41" class="beijing">世家公账</option>
+										<option value="12" class="beijing">筠姐支付宝</option>
+										<option value="22" class="beijing">筠姐微信</option>
+										<option value="71" class="beijing">筠姐上海银行卡</option>
 
 									</select>
 								</div>

public/app/js/timeline_pc.js

@@ -203,7 +203,7 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 					case '60' :
 						return '其他';
 					case '70' :
-						return '银满谷银行卡';
+						return '上海银满谷银行卡';
 					case '71' :
 						return '筠姐上海银行卡';
 					case '72' :
@@ -212,6 +212,8 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 						return '新同联福居银行卡';
 					case '74' :
 					    return '陈志杰招商银行卡';
+					case '75' :
+					    return '深圳银满谷银行卡';
 					default:
 						return '暂无数据';
 				}

public/resource/js/delFinanceReport.js

@@ -98,8 +98,13 @@ define(['doT', 'text!temp/delFinanceReport_template_tpl.html', 'css!style/home.c
 					receiv.restoreList($(this).attr('data-id'));
 				};
 			});
+			//刷新界面
+			_doc.on('click', '#maintable_search', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				receiv.getList()//刷新界面
 				
-			
+			});
 			// 初始化界面
 			$('.pic-con2').show();
 			$('.pic-con1').hide();

public/resource/js/fineMoney.js

@@ -272,7 +272,7 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
 						if(data.data) {
 							$("#fine_id_edit").html(data.data.id);
 							$("#fine_money_edit").val(data.data.money);
-							$("#fine_name_edit").html(data.data.submit_agent_name);
+							$("#fine_name_edit").html(data.data.agent_name);
 							$("#submit_name_edit").html(data.data.submit_agent_name);
 							$("#tijiao").html(data.data.create_time);
 							$("#remark_edit").val(data.data.remarks);

public/resource/js/noRansferEarnest.js

@@ -1604,8 +1604,8 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 			that.pageNo = no;
 //			var params = that.buildSearchParams(false);
             var params = {};
-            params.transfer_start_time = $('#comit_time_start').val();
-			params.transfer_end_time = $('#comit_time_end').val();
+            params.transfer_start_time = $('#pass_time_start').val();
+			params.transfer_end_time = $('#pass_time_end').val();
 			params.pay_id = $('#get_id').val();
 			params.order_id = $('#order_id').val();
 			params.house_id = $('#shop_id').val();
@@ -1680,18 +1680,32 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 				$('.shanghai').show();
 				$('.hangzhou').hide();
 				$('.shenzheng').hide();
+				$('.beijing').hide();
+				
 			}else if(data.site_id == 10002){
 				$('.shanghai').hide();
 				$('.hangzhou').show();
 				$('.shenzheng').hide();
+				$('.beijing').hide();
+				
 			}else if(data.site_id == 10003){
 				$('.shanghai').hide();
 				$('.hangzhou').hide();
 				$('.shenzheng').show();
+				$('.beijing').hide();
+				
+			}else if(data.site_id == 10005){
+				$('.shanghai').hide();
+				$('.hangzhou').hide();
+				$('.shenzheng').hide();
+				$('.beijing').show();
+				
 			}else{//北京 广州
 				$('.shanghai').show();
 				$('.hangzhou').hide();
 				$('.shenzheng').hide();
+				$('.beijing').hide();
+				
 			}
 			
 			//切换 中介费类型  多收金额 应收金额相应的改变

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -307,8 +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]['tenpay_2'] %]</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>