收款记录修改

application/index/view/collection/getCollection.html

@@ -75,7 +75,7 @@
                                     <th class="text-center">入账类型</th>
                                     <th class="text-center">入账方式</th>
                                     <th class="text-center">商铺地址</th>
-                                    <th class="text-center">商铺名称</th>
+                                    <th class="text-center">商铺号</th>
                                     <th class="text-center">操作</th>
                                 </tr>
                                 </thead>

public/resource/js/getCollection.js

@@ -19,6 +19,16 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 			follow.event();
 		},
 		event: function() {
+			var _doc = $(document);
+			_doc.on("click", ".timeline", function() {
+				follow.Timeline();
+			});
+				_doc.on('click', 'a[href="#modal-time"]', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+follow.house_id);
+			});
 			$("#search").click(function() {
 				follow.getList(1);
 			});
@@ -76,27 +86,21 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 				}
 			});
 		},
-		Caozuo:function(){//获取跟进详情的数据
+
+		//时间轴点击事件
+		
+		Timeline: function() { //获取时间轴
 			$.ajax({
 				'type': 'GET',
-				'url' : '/index/useraction_search',
-				data: {"user_id":follow.house_id},
+				'url': '/index/selectReportAll',
+				data: {
+					"order_id": follow.house_id
+				},
 				dataType: "json",
-				success: function(data){
-					if(data.code == 200){
-						if (data.data) {
-							$("#cus_id").html(data.data.user_info.user_id);//客户编号
-							$("#cus_name").val(data.data.user_info.user_nick);//姓名
-							$("#sex").val(data.data.user_info.sex);//性别
-							$("#cus_phone").html(data.data.user_info.user_phone);//电话
-							$("#cus_date").html(data.data.user_info.create_time);//上传时间
-							$("#cus_fang").val(data.data.user_info.agentinfo);//客方
-							var caozuo_table="";
-							$.each(data['data']['user_date'], function(i, item) {
-								console.log(item)
-								caozuo_table +='<tr><td>'+item.content+'</td><td>'+item.agentinfo+'</td><td>'+item.create_time+'</td></tr>';
-							});
-							$("#caozuo_table").html(caozuo_table);
+				success: function(data) {
+					if(data.code == 200) {
+						if(data.data) {
+							console.log(data.data);
 						}
 					} else {
 						alert('获取失败！');

public/resource/template/get_collection_template_tpl.html

@@ -10,10 +10,10 @@
         <td class="pay_type">[%= it[item]['pay_type'] %]</td>
         <td>[%= it[item]['type'] %]</td>
         <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['internal_title'] %]</td>      
+        <td>[%= it[item]['house_number'] %]</td>      
         <td>
-            <a class="btn1 btn-info caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
-            <a class="btn1 btn-info caozuo" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
+            <a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
+            <a class="btn1 btn-info " href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
         </td>
     </tr>
     [% } %]