财务报告修改

application/index/view/finance/account_statement.html

@@ -231,7 +231,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                   时间轴
                 </div>
             </div>
             <div class="modal-footer">

application/index/view/finance/refundList.html

@@ -230,7 +230,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                    时间轴
                 </div>
             </div>
             <div class="modal-footer">

application/index/view/finance/refund_order_list.html

@@ -230,7 +230,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                    时间轴
                 </div>
             </div>
             <div class="modal-footer">

application/index/view/finance/statement.html

@@ -71,9 +71,9 @@
                                                 <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="客户电话" type="text" value="">
-	                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
-	                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
-	                                            <span class="btn btn-info btn3 ld-Marheight" id="export">导出excel</span>                                         
+	                                            <span class="btn btn-info btn3" id="search">搜索</span>
+	                                            <span class="btn btn-info btn3" id="reset">重置</span>
+	                                            <span class="btn btn-info btn3" id="export">导出excel</span>                                         
                                         </form>
                                     </td>
                                 </tr>
@@ -166,7 +166,7 @@
     </div><!-- /.modal -->
 </div>
 <!-- 弹出框 时间 -->
-<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -179,7 +179,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                    时间轴
                 </div>
             </div>
             <div class="modal-footer">

application/index/view/finance/statement_backout.html

@@ -71,8 +71,8 @@
                                                 <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value="">
 	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="客户电话" type="text" value="">
-	                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
-	                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>                                       
+	                                            <span class="btn btn-info btn3" id="search">搜索</span>
+	                                            <span class="btn btn-info btn3" id="reset">重置</span>                                       
                                         </form>
                                     </td>
                                 </tr>
@@ -164,7 +164,7 @@
     </div><!-- /.modal -->
 </div>
 <!-- 弹出框 时间 -->
-<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -177,7 +177,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                    时间轴
                 </div>
             </div>
             <div class="modal-footer">

application/index/view/finance/wait_backout.html

@@ -217,7 +217,7 @@
 </div>
 
 <!-- 弹出框 时间 -->
-<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-timeline" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -230,7 +230,7 @@
             </div>
             <div class="modal-body">
                 <div class="modal-body" id="del_msg">
-                    确认删除吗？
+                    时间轴
                 </div>
             </div>
             <div class="modal-footer">

public/resource/js/refundList.js

@@ -350,7 +350,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListAttache/0',			    
+			    url: '/index/refundListAttache/0',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',
@@ -400,7 +400,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListManager/1',			    
+			    url: '/index/refundListManager/1',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',
@@ -451,7 +451,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListMajordomo/2',			    
+			    url: '/index/refundListMajordomo/2',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',
@@ -501,7 +501,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListCashier/3',			    
+			    url: '/index/refundListCashier/3',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',
@@ -541,7 +541,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListAttache/0',			    
+			    url: '/index/refundListAttache/0',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',

public/resource/js/refundOrderList.js

@@ -541,7 +541,7 @@ define(['doT', 'text!temp/refundorder_template_tpl.html', 'css!style/home.css',
 			
 			$.ajax({
 			    type: 'GET',
-			    url: '/index/reportListAttache/0',			    
+			    url: '/index/refundOrderList',			    
 			    data: params,
 			    timeout: 30000,
 			    dataType: 'json',
@@ -550,9 +550,9 @@ define(['doT', 'text!temp/refundorder_template_tpl.html', 'css!style/home.css',
 			        if(typeof data === 'object') {
 			            if (data.code == 200) {
 							var doTtmpl = doT.template(document.getElementById('refundorder_list_tpl').innerHTML);
-							$("#follow_list").html(doTtmpl(data.data.list));
+							$("#follow_list").html(doTtmpl(data.data.data.list));
 							/*分页代码*/
-                            add_page(data.data.total,pageNo,follow.pageSize,follow.getList);
+                            add_page(data.data.data.total,pageNo,follow.pageSize,follow.getList);
 		
 			            }else {
 			                alert(data['msg']);

public/resource/js/waitBackout.js

@@ -43,10 +43,7 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 			 //通过
 			 $ (document).delegate ("#confirm_pass", "click", function () {//点击通过
                 follow.confirmPass();
-            });
-			 $ (document).delegate (".is_pass", "click", function () {//点击通过
-			 	follow.house_id = $ (this).attr ("data-id");
-            });		 
+            });	 
 			 // 点击新增分佣提成
 			 $ (document).delegate ("#new-commission", "click", function () {//点击分佣提成
                 follow.newCommission();
@@ -78,50 +75,6 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 			$ (document).delegate ("#cashier", "click", function () {//出纳审核
 		        follow.Cashier();
 			});
-			//专员审核 总监审核 经理审核 出纳审核
-			
-			$ (document).on ("input","#cus_fang", function () {//手机号搜索客方2
-				if($("#cus_fang").val()==''){
-					$(".user-ul2").html('');
-				}else{
-					follow.search_phone2();
-				}
-			});
-			$ (document).delegate (".addphone2", "click", function () {//list2消失
-				follow.addphone2(this);
-			});
-
-		},
-		addphone2:function(obj){
-			var user_ht=$(obj).html();
-			$("#cus_fang").val(user_ht);
-			$(".user-ul2").html('');
-			follow.agent_id = $ (obj).attr ("data-id");
-
-		},
-		search_phone2:function(){//手机号
-			$.ajax ({
-				url: '/index/select_by_phone',
-				type: 'POST',
-				async: true,
-				data: {
-					"phone":$("#cus_fang").val()
-				},
-				dataType: 'json',
-				success: function (data) {
-					if (data.code == 200) {
-						var user_ul2 = "";
-						$.each(data.data, function(i,item) {
-							user_ul2+='<li class="addphone2" data-id="'+item.id+'">'+item.id+'-'+item.realname+'-'+item.phone+'</li>';
-						});
-						$(".user-ul2").html(user_ul2);
-
-					} else {
-						alert(data.msg);
-					}
-
-				}
-			});
 		},
 		Timeline:function(){//获取时间轴
 			$.ajax({
@@ -252,7 +205,6 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 		                }
 		            });
 		        },
-// 新增分佣提成
 		newCommission:function(){//新增分佣提成
 				            $.ajax({
 				                'type': 'POST',
@@ -275,7 +227,7 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
 				            });
 				        },
 
-// table切换
+        // table切换
         Information:function(){
         	$(".Tswitch").eq(0).show();
         	$(".Tswitch").eq(1).hide();
@@ -311,27 +263,6 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'css!style/home.css',
         	$("#records").addClass("btn-info"); 
         	
         },
-		Submit_follow: function() { //提交
-			$.ajax({
-				'type': 'POST',
-				'url': '/index/pcEditClient',
-				data: {
-					"id": follow.house_id,
-					"user_nick": $("#cus_name").val(),
-					"user_phone": $("#cus_phone").html(),
-					"agent_id":follow.agent_id,//客方
-					"sex": $("#sex").val()
-				},
-				dataType: "json",
-				success: function(data) {
-					if(data.code == 200) {
-						if(data.data) {
-						}
-					} else {
-					}
-				}
-			});
-		},
 		//专员审核
 		Commissioner: function(pageNo) {			
 			$("#commissioner").removeClass("btn-default");

public/resource/template/refund_template_tpl.html

@@ -2,17 +2,15 @@
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
-        <td>[%= it[item]['create_time'] %]</td>
-        <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['internal_title'] %]</td>
+        <td>[%= it[item]['agent_name'] %]</td>
+        <td>[%= it[item]['report_agent_name'] %]</td>
         <td>[%= it[item]['user_name'] %]</td>
-        <td>[%= it[item]['user_phone'] %]</td>
-        <td>[%= it[item]['commission'] %]</td>
-        <td>[%= it[item]['practical_fee'] %]</td>
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['refund_money'] %]</td>
+        <td>[%= it[item]['card_no'] %]</td>
         <td>
-            <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
+            <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>驳回</a>
             <a class="btn1 btn-success is_pass"  href="#modal-pass" data-toggle="modal" data-id='[%= it[item]["id"] %]'>通过</a>
-            <a class="btn1 btn-success genjing" href="#modal-follow" 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]["id"] %]'>时间轴</a>
         </td>
     </tr>

public/resource/template/refundorder_template_tpl.html

@@ -2,16 +2,13 @@
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
-        <td>[%= it[item]['create_time'] %]</td>
-        <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['internal_title'] %]</td>
+        <td>[%= it[item]['agent_name'] %]</td>
+        <td>[%= it[item]['report_agent_name'] %]</td>
         <td>[%= it[item]['user_name'] %]</td>
-        <td>[%= it[item]['user_phone'] %]</td>
-        <td>[%= it[item]['commission'] %]</td>
-        <td>
-            <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
-            <a class="btn1 btn-success is_pass"  href="#modal-pass" data-toggle="modal" data-id='[%= it[item]["id"] %]'>通过</a>
-            <a class="btn1 btn-success genjing" href="#modal-follow" data-toggle="modal" data-id='[%= it[item]["id"] %]' >跟进</a>
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['refund_money'] %]</td>
+        <td>[%= it[item]['card_no'] %]</td>
+        <td>         
             <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
         </td>
     </tr>
@@ -22,3 +19,4 @@
     </tr>
     [% } %]
 </script> 
+ 
\ No newline at end of file

public/resource/template/reportList_template_tpl.html

 <script id="reportList_list_tpl" type="text/template">
-    [% if(it) { %]
+    [% if(it && it.length && it.length>0) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
         <td>[%= it[item]['create_time'] %]</td>