后台相关

application/index/view/evaluation/evaluation_list.html

@@ -74,6 +74,12 @@
 												</select>
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="手机号" type="text" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="姓名" type="text" value="">
+                                            <select class="form-control btn4 ld-Marheight" name="" id="evaluation_type">
+													<option value="">选择评价类型</option>
+													<option value="1">进场评价</option>
+													<option value="2">收款评价</option>
+													
+											</select>
                                           <!--  <span class="fore-span ld-Marheight">进场平均分数:</span><span class="fore-span ld-Marheight evaluation-score" id='average_score'>空</span>-->
 <!--                                            <span class="fore-span ld-Marheight">评价平均分数:</span><span class="fore-span ld-Marheight evaluation-score" id='average_score_evaluation'>空</span>-->
                                             <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>

application/index/view/finance/daily_details.html

@@ -517,6 +517,8 @@
 									<th class="text-center shanghai">其他</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>
@@ -596,6 +598,9 @@
 										<td class="text-center shanghai">
 											<span id="pay_m"></span>
 										</td>
+										<td class="text-center shanghai">
+											<span id="pay_lin"></span>
+										</td>
 										
 										<!--杭州 店长 commit-->
 										<td class="text-center hangzhou">
@@ -663,7 +668,7 @@
 										<th class="text-center shenzhen">筠姐上海银行卡</th>
 										<th class="text-center shenzhen">POS机</th>
 										<th class="text-center shenzhen">世家公账</th>
-	            	                	<!--上海 杭州 total 财务-->
+	            	                	<!--上海  total 财务-->
 										<th class="text-center shanghai">施总支付宝</th>
 										<th class="text-center shanghai">林老师支付宝</th>
 										<th class="text-center shanghai">施总微信</th>
@@ -676,6 +681,8 @@
 										<th class="text-center shanghai">其他</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>
@@ -759,6 +766,9 @@
 											<td class="text-center shanghai">
 												<span id="total_n"></span>
 											</td>
+											<td class="text-center shanghai">
+												<span id="total_lin"></span>
+											</td>
 											
 											<!--杭州-->
 											<td class="text-center hangzhou">

application/index/view/finance/getCollection.html

@@ -844,6 +844,7 @@
 										<option value="11" class="shanghai">林老师支付宝</option>	
 										<option value="20" class="shanghai">施总微信</option>		
 										<option value="21" 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>

application/index/view/redEnvelope/cashAccountList.html

@@ -132,3 +132,23 @@
 	</div>
 	<!-- /.modal -->
 </div>
+<!--时间轴-->
+<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+				<h4 class="modal-title">
+                    时间轴
+                </h4>
+			</div>
+			<div class="modal-body" class="iframe-div-parent">
+				<iframe class="iframe-time-line"></iframe>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>

public/resource/js/cashAccountList.js

@@ -33,6 +33,13 @@ define (['doT', 'text!temp/cash_account_list_template_tpl.html', 'css!style/home
 			$("#reset").click(function() { //重置
 				document.getElementById("form_search").reset();
 			});
+			//操作----时间轴
+			$(document).on('click','.timeline',function(e){
+				var house_id = e.target.dataset.id;;
+				e.preventDefault();
+				e.stopPropagation();
+				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id=' + house_id);
+			});
 			$('#file_input_pic').on('change', function(){
 				var _this = $(this);
 				var formData = new FormData();

public/resource/js/financial_manager_daily_list.js

@@ -834,6 +834,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 									    $('#pay_h').html(data.data.commit_info.other_bank);
 									    $('#pay_k').html(data.data.commit_info.bank_card);
 									    $('#pay_m').html(data.data.commit_info.bank_card_new);
+									    $('#pay_lin').html(data.data.commit_info.bank_card_lin);
+									    
 								}
 							 
 							    $('#pay_i').html(data.data.commit_info.agent_name);
@@ -997,6 +999,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 									    $('#total_h').html(data.data.total_info.other_bank);
 									    $('#total_m').html(data.data.total_info.bank_card);
 									    $('#total_n').html(data.data.total_info.bank_card_new);
+									    $('#total_lin').html(data.data.total_info.bank_card_lin);
+									    
 									}
 				                    
 								    $('#total_i').html('');
@@ -1114,6 +1118,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	        	params.other_bank=$('#pay_h').html();
 	        	params.bank_card=$('#pay_k').html();
 	        	params.bank_card_new=$('#pay_m').html();
+	        	params.bank_card_lin=$('#pay_lin').html();
+	        	
         	};
         	//验证店长 提交日报时间 小于当前时间
         	var myDate = new Date();
@@ -1216,6 +1222,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	        	params.other_bank=$('#total_h').html();
 	        	params.bank_card=$('#total_m').html();
 	        	params.bank_card_new=$('#total_n').html();
+	        	params.bank_card_lin=$('#total_lin').html();
+	        	
         	};
             $.ajax({
                 url: '/index/commitCheck',

public/resource/template/cash_account_list_template_tpl.html

@@ -29,6 +29,8 @@
             [% if(it[item]['status'] == 0 &&  it[item]['is_essay'] == 2){ %]
             	<a class="btn1 btn-success audit-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>审核通过</a>
         	[% } %]
+        	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
+        	
             
         </td>
     </tr>