修改

application/index/view/member/users_list.html

@@ -2,7 +2,7 @@
 <input type="hidden" class="page-load" id="user" />
 <style>
 	.modal-body1 {
-		height: 600px;
+		height: 802px;
 		overflow-y: auto;
 		padding-bottom: 60px;
 	}
@@ -215,7 +215,7 @@
 	}
 	/*客户动态*/
 	.followup-modal-list-area {
-		height: 450px;
+		height: 350px;
 		overflow-y: scroll;
 	}
 	/*客户详情 头像*/
@@ -247,6 +247,21 @@
 	#preview{
 		z-index: 9999!important;
 	}
+	.modal-title-genjing{
+		height: 50px;
+		line-height: 50px;
+		border-top: 3px solid #ccc;
+	}
+	.right-btn{
+		float: right;
+		margin-top: 10px;
+		margin-bottom: 20px;
+	}
+	#caozuo_table_scroll{
+		height: 350px;
+		overflow-y: scroll;
+		
+	}
 </style>
 <!--导航star-->
 
@@ -572,8 +587,8 @@
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
                 </button>
-				<h4 class="modal-title">
-                    客户资料/跟进
+				<h4 class="modal-title text-info">
+                    客户详情
                 </h4>
 			</div>
 			<div class="modal-body modal-body1">
@@ -687,7 +702,8 @@
 					</thead>
 
 				</table>
-				<table class="table table-striped table-bordered table-hover table-condensed">
+				<div id="caozuo_table_scroll">
+					<table class="table table-striped table-bordered table-hover table-condensed">
 
 					<!--<thead>
 						<tr class="ld-Marheight">
@@ -697,15 +713,50 @@
 					<tbody class="text-center" id="caozuo_table"></tbody>
 
 				</table>
-
+				</div>
+				
+				<!--客户详情保存-->
+				<button type="button" class="btn btn-primary submit_edit right-btn" data-dismiss="modal">
+                    保存
+                </button>
+                <h4 class="modal-title-genjing clear text-info">
+                	客户跟进
+                </h4>
+				<div id="gen_jing_user">
+					<label class="col-sm-3 control-label">跟进：</label>
+					<div class="col-sm-9">
+						<textarea class="form-control" rows="3" id="genj_text"></textarea>
+						<span class="use-span text-danger">(必填)</span>
+					</div>
+					<label class="col-sm-3 control-label">状态标签：</label>
+					<div class="col-sm-9">
+						<label class="control-label">求租</label><input type="radio" name="user_status" value="0">
+						<label class="control-label">已租</label><input type="radio" name="user_status" value="1">
+						<label class="control-label">无效</label><input type="radio" name="user_status" value="-1">
+						<span class="text-danger">(必填)</span>
+					</div>
+					<div class="clear">
+					</div>
+					<div class="followup-modal-list-area">
+						<table class="table table-striped table-bordered table-hover table-condensed">
+							<tbody class="text-center" id="caozuo_table2">
+							</tbody>
+						</table>
+					</div>
+					<!--跟进保存-->
+					<button type="button" class="btn btn-primary right-btn" id="edit_add" data-dismiss="modal">
+                    保存
+                </button>
+				</div>
+                
 			</div>
-			<div class="modal-footer">
+			<!--<div class="modal-footer">
 				<button type="button" class="btn btn-default" data-dismiss="modal">关闭
                 </button>
 				<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal">
                     提交
                 </button>
-			</div>
+			</div>-->
 		</div>
 		<!-- /.modal-content -->
 	</div>

public/resource/template/user_template_tpl.html

@@ -41,9 +41,9 @@
 		</td>
 		<td width="16%">
 			[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %]
-			<a class="btn1 btn-success caozuo" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>详细信息</a>&nbsp;
+			<a class="btn1 btn-success caozuo genj_ure" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>详情/跟进</a>&nbsp;
 			
-			<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;
+			<!--<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;-->
 			
 			<a class="btn1 btn-success take-look" href="#modal-takeLook" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]' data-phone='[%= it[item]["user_phone"] %]'>约带看</a>
 			[% } %]