Skip to content

T
tl_estate
Commit 55b63672 authored by agping's avatar agping
Browse files
Options

2.7.2版本

parent 24ab9ca9
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 59 deletions
application/index/view/member/users_list.html
View file @ 55b63672
......@@ -421,7 +421,7 @@
<option value="1">是</option>
</select>
<select class="form-control btn2 margin-top-ld" name="public_status">
<option value="">客户状态</option>
<option value="2">客户状态</option>
<option value="0">求租</option>
<option value="1">已租</option>
<option value="-1">无效</option>
......
application/index/view/remark/remark_follow_index.html
View file @ 55b63672
......@@ -14,7 +14,6 @@
.user-ul {
width: 100%;
height: auto;
/*padding-bottom: 15px;*/
float: left;
position: relative;
left: -40px;
......@@ -44,15 +43,6 @@
.input {
width: 16%!important;
}
/*.text-left {
float: left;
display: inline-block;
height: 26px;
line-height: 26px;
font-size: 14px;
}
*/
.text-right {
float: right;
display: inline-block;
......@@ -104,7 +94,6 @@
margin-top: 30px;
}
/*客户列表商 约带看*/
.detail-modal-bargaininfo-main-left {
float: left;
width: 340px;
......@@ -226,10 +215,7 @@
height: 30px;
border-radius: 15px;
}
/*初始化 隐藏时间控件*/
/*.datetimepicker{
opacity: 0;
}*/
/*拨打电话样式*/
.modal-body-width {
......@@ -278,7 +264,6 @@
#user_up,
#user_down {
/*font-size:14px;*/
color: #337ab7;
cursor: pointer;
}
......@@ -342,25 +327,15 @@
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name_id" placeholder="客户编号" type="text" value="">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_phone" placeholder="客户手机号" type="tel" value="">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="follow_content" placeholder="跟进内容" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_name" placeholder="跟进人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_phone" placeholder="跟进人手机号" type="text" value="">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_store" placeholder="跟进人所在门店" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_district" placeholder="跟进人所在部门" type="text" value="">-->
<select class="form-control btn4 ld-Marheight input" name="" id="district_id">
<option value="">跟进人所在部门</option>
</select>
<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
</select>
<!--<select class="form-control btn2 ld-Marheight" id="user_city_choose">
<option value="" selected="selected">城市筛选</option>
<option value="310100">上海市</option>
<option value="330100">杭州市</option>
</select>-->
<div class="clear "></div>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
......@@ -379,7 +354,6 @@
<tbody class="text-center" id="follow_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div>
......@@ -487,8 +461,6 @@
</td>
<td>
<span class="fore-span">昵称:</span>
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<img src="" alt="" class="fore-span diagram-image J_preview user_pic" data-bimg='' />
<span class="fore-span cus_nick"></span>
</td>
......@@ -498,8 +470,6 @@
<span class="fore-span">创建时间:</span>
<span class="fore-span cus_date"></span>
</td>
<!--<td>
</td>-->
<td>
<span class="fore-span">下载登录时间:</span>
<span class="fore-span firstlogin_time"></span>
......@@ -528,9 +498,6 @@
</td>
</tr>
<!--<tr class="ld-Marheight">
<td class="text-left"><label>客方修改记录：</label></td>
</tr>-->
</thead>
</table>
......@@ -647,9 +614,8 @@
</h4>
</div>
<div class="modal-body">
<!--<input type="hidden " value=" " id="delete_id " />-->
<div id="phone_title2">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" id="unbind_call">没打通
......@@ -770,7 +736,6 @@
<td>
<span class="fore-span ld-Marheight">电话:</span>
<span class="fore-span ld-Marheight cus_phone"></span>
<!--<a class="fore-span btn-primary ld-Marheight user_call" data-toggle="modal">拨打</a>-->
</td>
</tr>
<tr>
......@@ -807,8 +772,6 @@
</td>
<td>
<span class="fore-span ld-Marheight">昵称:</span>
<!--<input type="hidden" value='[%= it[item]["agent_img"] %]'>-->
<!--<img src='' class="diagram-image J_preview" data-bimg=''>-->
<img src="" alt="" class="fore-span ld-Marheight diagram-image J_preview user_pic" data-bimg=''/>
<span class="fore-span ld-Marheight cus_nick"></span>
</td>
......@@ -865,14 +828,7 @@
</table>
<div id="caozuo_table_scroll">
<table class="table table-striped table-bordered table-hover table-condensed">
<!--<thead>
<tr class="ld-Marheight">
<td class="text-left">客方修改记录：</td>
</tr>
</thead>-->
<tbody class="text-center" id="caozuo_table_edit"></tbody>
</table>
</div>
......@@ -883,13 +839,6 @@
</div>
</div>
<!--<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>
<!-- /.modal-content -->
</div>
......
public/resource/js/user.js
View file @ 55b63672
......@@ -59,6 +59,41 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
} else {
};
//初始化时间
function  getPreMonth(date)  {            
var  arr  =  date.split('-');            
var  year  =  arr[0];             
var  month  =  arr[1];             
var  day  =  arr[2];             
var  days  =  new  Date(year,  month,  0);            
days  =  days.getDate();             
var  year2  =  year;            
var  month2  =  parseInt(month)  -  1;            
if (month2  ==  0)  {                
year2  =  parseInt(year2)  -  1;                
month2  =  12;            
}            
var  day2  =  day;            
var  days2  =  new  Date(year2,  month2,  0);            
days2  =  days2.getDate();            
if (day2  >  days2)  {                
day2  =  days2;            
}            
if (month2  <  10)  {                
month2  =  '0'  +  month2;            
}            
var  t2  =  year2  +  '-'  +  month2  +  '-'  +  day2;            
return  t2;        
}
//初始化时间
var myDate = new Date();
var y = myDate.getFullYear();
var m = myDate.getMonth() + 1;
var d = myDate.getDate();
var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
var day_start = getPreMonth(day_end);
$('#start_date').val(day_start);
$('#end_date').val(day_end);//客户列表 进来 默认时间 一个月
user.getList();
user.event();
//新增 默认上海
......@@ -69,8 +104,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
});
$('#user_area_add').html(_str);
});
//时间控件初始化
//bootstrap 时间控件选择
//汉化实现
;(function($){
......@@ -232,6 +265,47 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
BrowseServer('cover_image');
});
$("#search").click(function() {
// 客户编号 客户姓名 客户手机号 搜索 创建时间不受限制
if(($.trim($("#start_date").val()) && $.trim($("#end_date").val()))||($.trim($("input[name='user']").val())||$.trim($("input[name='phone']").val())||$.trim($("input[name='userID']").val()))
){
}else{
// 初始化时间 两个月
function  getPreMonthTwo(date)  {            
var  arr  =  date.split('-');            
var  year  =  arr[0];             
var  month  =  arr[1];             
var  day  =  arr[2];             
var  days  =  new  Date(year,  month,  0);            
days  =  days.getDate();             
var  year2  =  year;            
var  month2  =  parseInt(month)  -  2;            
if (month2  ==  0)  {                
year2  =  parseInt(year2)  -  1;                
month2  =  12;            
}            
var  day2  =  day;            
var  days2  =  new  Date(year2,  month2,  0);            
days2  =  days2.getDate();            
if (day2  >  days2)  {                
day2  =  days2;            
}            
if (month2  <  10)  {                
month2  =  '0'  +  month2;            
}            
var  t2  =  year2  +  '-'  +  month2  +  '-'  +  day2;            
return  t2;        
}
//初始化时间
var myDate = new Date();
var y = myDate.getFullYear();
var m = myDate.getMonth() + 1;
var d = myDate.getDate();
var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
var day_start = getPreMonthTwo(day_end);
$('#start_date').val(day_start);
$('#end_date').val(day_end);//客户列表 搜索 默认时间 2个月
}
user.getList(1);
});
......@@ -1390,7 +1464,22 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
params.city = '杭州市' ;
}
params.disc = $.trim($("#user_area_choose").val());//区域
// 创建时间 筛选 不能超过 2个月
var start_ = params.start_date+" 00:00:00";
date_start =new Date(Date.parse(start_.replace(/-/g, "/")));
var start_time =date_start.getTime();
var end_ = params.end_date+" 00:00:00";
date_end =new Date(Date.parse(end_.replace(/-/g, "/")));
var end_time =date_end.getTime();
var cha_time=end_time-start_time;
// 客户编号 客户姓名 客户手机号 搜索 创建时间不受限制
if($.trim($("input[name='user']").val())||$.trim($("input[name='phone']").val())||$.trim($("input[name='userID']").val())){
}else{
if(cha_time > 5270400000){
alert("创建时间筛选区间不能超过2个月");
return;
}
}
$.ajax({
url: '/index/users_list',
type: 'GET',
......
public/resource/template/remark_follow_template_tpl.html
View file @ 55b63672
<script id="remark_follow_tpl" type="text/template">
[% var sw=function(s){switch(Number(s)){case 2:return"btn-info";case 1:return"btn-default"}}; %]
[% if(it[0]) { %]
[% for(var item in it){ %]
<tr class="text-center">
......@@ -22,16 +23,19 @@
[% if(it[item]['user_name']) { %]
[%= it[item]['user_name'] %]
[% } %]
[% if(it[item]["is_outstrip_twenty_four_hours"] == 0) { %]
<span class="btn1 btn-warning btn-xs">保护期内</span>
[% } %]
</td>
<!--<td>[%= it[item]['user_phone'] %]</td>-->
<td>[%= hideTel(it[item]['user_phone']) %]</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') && it[item]['vip'] == 0)) { %]
[% 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') && it[item]['vip'] == 0 && it[item]["is_outstrip_twenty_four_hours"]*1)) { %]
<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]
<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]'>客户编辑</a>&nbsp;
[% } %]
[% } %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment