客户列表修改

application/index/view/member/users_list.html

@@ -192,6 +192,17 @@
 	.opacity-0{
 		opacity: 0;
 	}
+	#user_call{
+		height: 20px;
+		width: 30px;
+		border-radius: 3px;
+		line-height: 20px;
+		margin-top: 22px;
+		font-size: 10px;
+		text-align: center;
+		cursor:pointer
+		
+	}
 </style>
 <!--导航star-->
 
@@ -553,6 +564,7 @@
 
 									<span class="fore-span ld-Marheight">电话:</span>
 									<span class="fore-span ld-Marheight" id="cus_phone"></span>
+									<a class="fore-span btn-primary ld-Marheight" id="user_call" href="#modal-call" data-toggle="modal">拨打</a>
 									<div class="clear"></div>
 
 									<span class="fore-span ld-Marheight">创建时间:</span>
@@ -581,7 +593,7 @@
 							<th class="text-center">跟进时间</th>
 						</tr>
 					</thead>
-					<tbody class="text-center" id="caozuo_table">
+					<tbody class="text-center" id="caozuo_table"></tbody>
 
 				</table>
 
@@ -653,6 +665,18 @@
 					<label class="control-label">无效</label><input type="radio" name="user_status" value="-1">
 					<span class="text-danger">(必填)</span>
 				</div>
+				<table class="table table-striped table-bordered table-hover table-condensed"">
+					<thead>
+						<tr class="ld-Marheight">
+							<th class="text-center">跟进内容</th>
+							<th class="text-center">跟进人</th>
+							<th class="text-center">跟进时间</th>
+					   </tr>
+					</thead>
+					<tbody class="text-center" id="caozuo_table2"></tbody>
+				</table>
+				      
+				
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-default" data-dismiss="modal">关闭
@@ -784,4 +808,33 @@
 		<!-- /.modal-content -->
 	</div>
 	<!-- /.modal -->
+</div>
+<!--拨打手机号-->
+<div class="modal fade" id="modal-call" 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">
+                    &times;
+                </button>
+				<h4 class="modal-title">
+                   请使用13918937741的手机拨打该虚拟号
+                </h4>
+			</div>
+			<div class="modal-body">
+				<div class="modal-body">
+					<input type="hidden" value="" id="delete_id" /> 13918937765
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">没打通
+                </button>
+				<button type="button" class="btn btn-primary" id="confirm_delete">
+                    已拨打
+                </button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
 </div>
\ No newline at end of file

public/resource/js/user.js

@@ -559,17 +559,53 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                 }
             });
         },
+//      getGenjinLabel:function () {
+//           $('#genj_text').val('');
+//          $.ajax ({
+//              url: '/index/getUserLabel',
+//              type: 'GET',
+//              async: true,
+//              data: {"user_id":user.user_id},
+//              dataType: 'json',
+//              success: function (data) {
+//                  if (data.code == 200 && data.data != null) {
+//                      $("input[type='radio'][name='user_status'][value="+data.data+"]").prop("checked", "checked");
+//                      //客户动态 即跟进
+//                      var caozuo_table="";
+//                          $.each(data['data']['user_history'], function(i, item) {
+//                              caozuo_table +='<tr><td>'+item.remark+'</td><td>'+item.name+'</td><td>'+item.create_time+'</td></tr>';
+//                          });
+//                          $("#caozuo_table2").html(caozuo_table);
+//
+//                  }
+//              }
+//          });
+//      },
         getGenjinLabel:function () {
              $('#genj_text').val('');
+             var  user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo')));  //读取缓存
+             console.log(user_info_obj.AuthToken);
+             console.log(user_info_obj);
+             
             $.ajax ({
-                url: '/index/getUserLabel',
+                url: '/broker/useraction_search',//添加动态
                 type: 'GET',
                 async: true,
-                data: {"user_id":user.user_id},
+                data: {
+                	"user_id":user.user_id,
+                	"AuthToken":user_info_obj.AuthToken,
+                	"pagenum":1
+                },
                 dataType: 'json',
                 success: function (data) {
                     if (data.code == 200 && data.data != null) {
-                        $("input[type='radio'][name='user_status'][value="+data.data+"]").prop("checked", "checked");
+//                      $("input[type='radio'][name='user_status'][value="+data.data+"]").prop("checked", "checked");
+                        //客户动态 即跟进
+                        var caozuo_table="";
+                            $.each(data['data']['user_history'], function(i, item) {
+                                caozuo_table +='<tr><td>'+item.remark+'</td><td>'+item.name+'</td><td>'+item.create_time+'</td></tr>';
+                            });
+                            $("#caozuo_table2").html(caozuo_table);
 
                     }
                 }