用户列表修改

application/index/view/member/users_list.html

@@ -801,8 +801,10 @@
 									</div>-->
 									<div class="clear"></div>
 									<span class="fore-span ld-Marheight">预计到场时间:</span>
-									<input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="look_shop_date" name=" " type="datetime-local">
+									<input class="form-control btn6 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="" name=" " type="datetime-local">
 									<!--datetime-local-->
+									<!--bootstrap 时间控件-->
+										<input type="text" value="" class="form_datetime form-control btn6 ld-Marheight" id="look_shop_date" readonly="readonly">
 									<div class="clear"></div>
 
 									<div class="textarea-con ld-Marheight">

public/resource/js/user.js

@@ -16,13 +16,20 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			user.getList();
 			user.event();
 			//时间控件初始化
-			/*   $('#datetimepicker').datetimepicker({
-			       format: 'yyyy-MM-dd',
+//			   $('#datetimepicker').datetimepicker({
+//			       format: 'yyyy-MM-dd',
+//			       language: 'zh-CN',
+//			       pickTime: false
+//			   }).on('changeDate',function(){
+//			       $(this).datetimepicker('hide');
+//			   });
+           //bootstrap 时间控件选择
+			$(".form_datetime").datetimepicker({
+			 format: 'yyyy-MM-dd HH:mm',
+	        autoclose: true,
 	        language: 'zh-CN',
-			       pickTime: false
-			   }).on('changeDate',function(){
-			       $(this).datetimepicker('hide');
-			   });*/
+	        minuteStep: 1
+			});
 		},
 		event: function() {
 			var _doc = $(document);
@@ -126,7 +133,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
             //点击新增客户 清除id
             
             $(document).delegate(".add-user-new", "click", function() { //新增客户
-				user.agent_id2='';
+				user.agent_id='';
 			});
 			// 跟进的提交按钮 点击
 			$(document).delegate("#edit_add", "click", function(e) {
@@ -144,9 +151,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				user.user_phone = $(this).attr("data-phone");
 				user.Caozuo();
 			});
-			$(document).on("input", "#set_father_id3", function() { //手机号搜索客方
+			$(document).on("input", "#set_father_id3", function() { //手机号新增搜索客方
 				if($("#set_father_id3").val() == '') {
-					user.agent_id2='';
+					user.agent_id='';
 					$(".user-ul").html('');
 				} else {
 					user.search_phone();
@@ -175,14 +182,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				}
 			});
 			
-			$(document).on("input", "#cus_fang", function() { //手机号搜索客方2
+			$(document).on("input", "#cus_fang", function() { //手机号搜索客方2 编辑
 				if($("#cus_fang").val() == '') {
+					user.agent_id2='';
 					$(".user-ul2").html('');
 				} else {
 					user.search_phone2();
 				}
 			});
-			$(document).delegate(".addphone", "click", function() { //list消失
+			$(document).delegate(".addphone", "click", function() { //list消失新增客户 点击li事件 获取id ul消失
 				user.addphone(this);
 			});
 			$(document).delegate(".addphone2", "click", function() { //list2消失
@@ -259,22 +267,19 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				_this.parent().prev().val(_this.html()).attr('data-id', _this.attr('data-id'));
 				_this.parent().html('').hide();
 			});
-
-			// ===================
-
 		},
-		addphone: function(obj) {
+		addphone: function(obj) {//新增客户 input赋值
 			var user_ht = $(obj).html();
 			$("#set_father_id3").val(user_ht);
 			$(".user-ul").html('');
 			user.agent_id = $(obj).attr("data-id");
-
 		},
 		addphone2: function(obj) {
 			var user_ht = $(obj).html();
 			$("#cus_fang").val(user_ht);
 			$(".user-ul2").html('');
 			user.agent_id2 = $(obj).attr("data-id");
+
 		},
 		//约带看 商铺名称搜索
 		addphone3: function(obj) {
@@ -352,7 +357,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			}
 			
 		},
-		search_phone: function() { //手机号
+		search_phone: function() { //手机号新增客户
 			$.ajax({
 				url: '/index/getBroker_new',
 				type: 'GET',
@@ -376,7 +381,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				}
 			});
 		},
-		search_phone2: function() { //手机号
+		search_phone2: function() { //手机号 编辑是 客方搜索
 			$.ajax({
 				url: '/index/getBroker_new',
 				type: 'GET',
@@ -576,7 +581,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				}
 			});
 		},
-		// ====================新增客户页面==================
+		// 新增客户页面
 		Caozuo: function() { //获取跟进详情的数据
 			$.ajax({
 				'type': 'GET',