Skip to content

T
tl_estate
Commit a4d258a9 authored by clone's avatar clone
Browse files
Options

Merge branch 'wx0604' of https://gitee.com/zwyjjc/tl_estate into wx0604

parents c8f722e6 a386e91f
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 104 deletions
application/index/controller/Notice.php
View file @ a4d258a9
......@@ -40,19 +40,19 @@ class Notice extends Basic
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$where['create_time'] = [ '> time', $this->params['start_time'] . ' 00:00:00' ];
$where['a.create_time'] = [ '> time', $this->params['start_time'] . ' 00:00:00' ];
}
if (!empty($this->params['end_time']) && empty($this->params['start_time'])) {
$where['create_time'] = [ '< time', $this->params['end_time'] . ' 23:59:59' ];
$where['a.create_time'] = [ '< time', $this->params['end_time'] . ' 23:59:59' ];
}
if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
$where['create_time'] = [ 'between time', [ $this->params['start_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
$where['a.create_time'] = [ 'between time', [ $this->params['start_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
if (!empty($this->params['title'])) {
$where['title'] = ['LIKE', '%' . $this->params['title'] . '%'];
$where['a.title'] = ['LIKE', '%' . $this->params['title'] . '%'];
}
$field = 'a.id,a.title,a.content,a.create_time,b.name';
......
application/index/view/evaluation/evaluation_list.html
View file @ a4d258a9
......@@ -27,6 +27,11 @@
#reset{
float: left;
}
.evaluation-score{
margin-right: 10px;
font-weight: bold;
font-size: 16px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -65,8 +70,8 @@
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="姓名" type="text" value="">
<span class="fore-span ld-Marheight">进场平均分数:</span><span class="fore-span ld-Marheight" id='average_score'>空</span>
<span class="fore-span ld-Marheight">评价平均分数:</span><span class="fore-span ld-Marheight" id='average_score_evaluation'>空</span>
<span class="fore-span ld-Marheight">进场平均分数:</span><span class="fore-span ld-Marheight evaluation-score" id='average_score'>空</span>
<span class="fore-span ld-Marheight">评价平均分数:</span><span class="fore-span ld-Marheight evaluation-score" id='average_score_evaluation'>空</span>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form>
......@@ -110,7 +115,7 @@
</h4>
</div>
<div class="modal-body">
暂不能删除
暂不支持删除
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
......
application/index/view/marchin/marchin_list.html
View file @ a4d258a9
......@@ -66,7 +66,7 @@
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="report_agent_phone" placeholder="报备人手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="house_title" placeholder="商铺名" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="shop_type">
<option value="-1">商铺类型</option>
<option value="">商铺类型</option>
<option value="0">商场</option>
<option value="1">街铺</option>
</select>
......
application/index/view/notice/index.html
View file @ a4d258a9
......@@ -7,7 +7,8 @@
padding-bottom: 60px;
}
.modal-body2{
padding: 45px;
padding: 35px;
height: 380px;
}
.user-ul {
......@@ -98,6 +99,22 @@
.bottom{
margin-top: 30px;
}
.btn6_1{
width: 80% !important;
float: left;
}
.notice-title{
font-size: 20px;
}
.notice-time{
font-size: 13px;
margin-top: 20px;
}
.notice-text{
font-size: 16px;
margin-top: 30px;
text-indent: 2em;
}
</style>
<!--导航star-->
......@@ -198,7 +215,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">内容：</label>
<div class="col-sm-9">
<textarea class="form-control btn6" name="agent_id" autocomplete="off" id="announcement_content" rows="10" cols="40"></textarea>
<textarea class="form-control btn6_1" name="agent_id" autocomplete="off" id="announcement_content" rows="10" cols="40" placeholder="请输入内容"></textarea>
<ul class="user-ul">
</ul>
......
application/index/view/supervise/carryOut.html
View file @ a4d258a9
......@@ -49,10 +49,18 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date">
<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_date1" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_shop" placeholder="拜访人所属门店名称" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_phone" placeholder="拜访人手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_name" placeholder="拜访人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visiting_shop" 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>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="submit_phone" placeholder="提交人手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="submit_remark" placeholder="跟进内容" type="text" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form>
......@@ -93,7 +101,8 @@
</h4>
</div>
<div class="modal-body">
<img src="images/banner/Tulips.jpg" alt="" />
<img src="" alt="" class="review-images2"/>
<!--<img src="images/banner/Tulips.jpg" alt="" />-->
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
......
public/resource/js/carryOut.js
View file @ a4d258a9
......@@ -27,11 +27,32 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
// console.log('follow.house_id');
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+follow.house_id);
});
//二级联动
follow.getDistrict(function(){
_doc.on('input', '#district_id, #district_id2', function(){
var _this = $(this);
var _id = _this.val();
_this.next().html('');//先清空
if(_id && _id != '0'){
follow.getDistrictStoreList(_id, function(_data){
// var _str = '';
var _str = '<option value="0">全部</option>';
$.each(_data, function(i,item) {
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
_this.next().html(_str);
});
}else{
};
});
});
$("#search").click(function() {
follow.getList(1);
});
$("#reset").click(function() { //重置
document.getElementById("form_search").reset();
$('#guest_stores').html('');
});
$("#export").click(function() { //导出列表
follow.exportList();
......@@ -42,6 +63,11 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
$("#real_money").val($(this).attr ("data-money"));
});
$ (document).delegate (".review-images", "click", function () {//提交
// console.log($(this).attr ("data-img"));
$('.review-images2').attr('src',$(this).attr ("data-img"));
});
$ (document).delegate (".submit_edit", "click", function () {//提交
follow.Submit_follow();
......@@ -126,6 +152,44 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
window.open('/index/getCollection?'+
'excel='+ excel_two +'&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_title=' + internal_title + '&user_phone=' + user_phone + '&id=' + id+ '&store_name=' + store_name+ '&report_phone=' + report_phone+ '&report_name=' + report_name);
},
//调用部门 和 门店的接口
getDistrict : function (fn) {
$.ajax ({
url: '/index/getDistrict',
type: 'GET',
async: true,
data: {"pageSize":1000},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
var str = '';
$.each(data.data, function(i,item) {
str += '<option value="'+item.id+'">'+item.district_name+'</option>';
});
$("#district_id").append(str);
$("#district_id2").append(str);
fn && fn();
}
}
});
},
getDistrictStoreList: function(id, fn){
$.ajax ({
url: '/index/getDistrictStoreList',
type: 'GET',
async: true,
data: {
'id':id,
"pageSize":1000
},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
fn && fn(data.data);
}
}
});
},
getList: function(pageNo) {
console.log($('#customer_name').val());
......@@ -133,15 +197,12 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
console.log($('#shop_name').val());
follow.pageNo = pageNo;
var params = {};
params.user_name =$.trim($('#customer_name').val());
params.start_time =$('#start_date').val();
params.end_time =$('#end_date').val();
params.internal_title =$('#shop_name').val();
params.user_phone =$('#customer_phone').val();
// params.id =$('#shop_num').val()*1;
params.store_name =$('#store_name').val();
params.report_phone =$('#applicant_phone').val();
params.report_name =$('#applicant_name').val();
params.create_time_start =$.trim($('#start_date').val());
params.create_time_end =$('#end_date').val();
params.district_id =$('#district_id').val();
params.store_id =$('#guest_stores').val();
params.phone =$('#submit_phone').val();
params.remark =$('#submit_remark').val();
params.pageNo = follow.pageNo;
params.pageSize = follow.pageSize;
......
public/resource/js/evaluationList.js
View file @ a4d258a9
......@@ -28,7 +28,8 @@ define(['doT', 'text!temp/evaluation_list_template_tpl.html', 'css!style/home.cs
_this.next().html('');//先清空
if(_id && _id != '0'){
follow.getDistrictStoreList(_id, function(_data){
var _str = '';
// var _str = '';
var _str = '<option value="0">全部</option>';
$.each(_data, function(i,item) {
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
......@@ -50,9 +51,6 @@ define(['doT', 'text!temp/evaluation_list_template_tpl.html', 'css!style/home.cs
console.log($(this).attr ("data-img"));
});
$("#export").click(function() { //导出列表
follow.exportList();
});
$ (document).delegate (".submit_edit2", "click", function () {//提交
follow.house_id2 = $ (this).attr ("data-id");
console.log(follow.house_id2);
......@@ -136,7 +134,7 @@ define(['doT', 'text!temp/evaluation_list_template_tpl.html', 'css!style/home.cs
params.march_in_time_end =$('#create_time_end').val();
params.district_id =$('#district_id').val()*1;
params.store_id =$('#guest_stores').val()*1;
params.user_name =$('#user_name').val();
params.user_nick =$('#user_name').val();
params.user_phone =$('#user_phone').val();
params.pageNo = follow.pageNo;
params.pageSize = follow.pageSize;
......
public/resource/js/marchinList.js
View file @ a4d258a9
......@@ -28,7 +28,8 @@ define(['doT', 'text!temp/marchin_list_template_tpl.html', 'css!style/home.css',
_this.next().html('');//先清空
if(_id && _id != '0'){
follow.getDistrictStoreList(_id, function(_data){
var _str = '';
// var _str = '';
var _str = '<option value="0">全部</option>';
$.each(_data, function(i,item) {
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
......@@ -148,17 +149,6 @@ define(['doT', 'text!temp/marchin_list_template_tpl.html', 'css!style/home.css',
params.report_agent_name =$('#report_agent_name').val();
params.house_title =$('#house_title').val();
params.shop_type =$('#shop_type').val()*1;//跟进搜索
// create_time_start false string 进场时间开始时间
//create_time_end false string 进场时间结束时间
//district_id false int 部门（传ID）
//store_id false int 门店名称（传ID）
//user_name false sting 客户姓名
//user_phone false string 客户手机号
//report_agent_phone false string 报备人手机号
//report_agent_name false sting 报备人姓名
//house_title false sting 商铺名
//shop_type false int 商铺类型（0商场，1街铺）
params.pageNo = follow.pageNo;
params.pageSize = follow.pageSize;
$.ajax({
......
public/resource/js/notice.js
View file @ a4d258a9
......@@ -11,8 +11,6 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
$ ("body").append (template);
user.getList ();
user.event ();
user.getDistrict();
user.getDistricttwo();
//时间控件初始化
/* $('#datetimepicker').datetimepicker({
format: 'yyyy-MM-dd',
......@@ -48,17 +46,18 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
$("#confirm_delete").click(function(){
var params = {};
params.id = $ ("#delete_id").val ();
params.status = 1;
params.id = user.announcementdel_id;
console.log(user.announcementdel_id);
if(!params.id || params.id == null){
alert ("要删除的id不能为空");
return false;
}
user.delete_user(params);
});
// $ (document).delegate (".announcement-del", "click", function () {
//// user.announcement-del = $ (this).attr ("data-id");
// });
$ (document).delegate (".announcement-del", "click", function () {
user.announcementdel_id = $ (this).attr ("data-id");
console.log(user.announcementdel_id);
});
$ (document).delegate (".add_alert", "click", function () {//新增客户
document.getElementById("add_user_form").reset();
......@@ -287,6 +286,8 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
params.start_time = $("#start_date").val();
params.end_time = $("#end_date").val();
params.title = $("#release_title").val();
params.pageNo = user.pageNo;
params.pageSize = user.pageSize;
$.ajax ({
url: '/index/noticeIndex',
......@@ -327,6 +328,11 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
alert('内容不能为空');
$("#announcement_content").focus();
return ;
}
if (params.content.length > 250) {
alert('公告内容字数250以内');
$("#announcement_content").focus();
return ;
}
$.ajax ({
url: '/index/addNotice',
......@@ -336,6 +342,7 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
dataType: 'json',
success: function (data) {
if (data.code == 200) {
$ ("#modal_add_user").modal ('hide');//提交成功 关闭模态框
user.getList(1);
alert('提交成功')
} else {
......@@ -346,7 +353,7 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
},
delete_user : function(params) {
$.ajax ({
url: '/index/del_user',
url: '/index/delNotice',
type: 'POST',
async: true,
data: params,
......@@ -361,51 +368,11 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
}
});
},
getDistrict : function () {
$.ajax ({
url: '/index/getDistrict',
type: 'GET',
async: true,
data: {"pageSize":50},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
var str = '<option value="0">客方所属部门</option>';
$.each(data.data, function(i,item) {
str += '<option value="'+item.id+'">'+item.district_name+'</option>';
});
$("#district_id").html(str);
}
}
});
},
getDistricttwo : function () {
$.ajax ({
url: '/index/getDistrict',
type: 'GET',
async: true,
data: {"pageSize":50},
dataType: 'json',
success: function (data) {
if (data.code == 200 && data.data != null) {
var str = '<option value="0">邀请人所属部门</option>';
$.each(data.data, function(i,item) {
str += '<option value="'+item.id+'">'+item.district_name+'</option>';
});
$("#district_id2").html(str);
}
}
});
}
};
return user;
});
function delete_user (obj) {
$ ("#delete_id").val ($ (obj).attr ("data-id"));
}
function edit(obj) {
var params = {}
......
public/resource/template/carry_out_template_tpl.html
View file @ a4d258a9
......@@ -3,11 +3,12 @@
[% for(var item in it){ %]
<tr class="text-center">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['user_name'] %]</td>
<td>[%= it[item]['user_phone'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['name'] %]</td>
<td>[%= it[item]['address'] %]</td>
<td>[%= it[item]['remark'] %]</td>
<td>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>查看</a>
<a class="btn1 btn-info review-images" href="#modal-time" data-toggle="modal" data-img='[%= it[item]["supervise_img"] %]'>查看</a>
<!--<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>查看</a>-->
</td>
</tr>
......
public/resource/template/marchin_list_template_tpl.html
View file @ a4d258a9
......@@ -8,7 +8,7 @@
<td>[%= it[item]['report_agent_name'] %]</td>
<td>[%= it[item]['house_title'] %]</td>
<td>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["report_id"] %]'>时间轴</a>
</td>
</tr>
[% } %]
......
public/resource/template/notice_template_tpl.html
View file @ a4d258a9
......@@ -3,18 +3,21 @@
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['create_time'] %]</td>
<td>[%= hideTel(it[item]["name"]) %]</td>
<!--<td>[%= hideTel(it[item]["name"]) %]</td>-->
<td>[% if(it[item]["name"] != null) { %]
[%= it[item]["name"] %]
[% } %]
</td>
<td>[%= it[item]["title"] %]</td>
<td>
<a class="btn1 btn-success announcement-details" href="#modal-record" data-toggle="modal" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-content='[%= it[item]["content"] %]'>
查看
</a>
<a class="btn1 btn-success genj_ure" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"] %]'>
删除
</a>
<!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>-->
<!--删除-->
<!--</a>-->
[% if(check_auth('index/delNotice')) { %]
<!--删除权限-->
<a class="btn1 btn-success announcement-del" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a>
[% } %]
</td>
</tr>
[% } %]
......@@ -23,4 +26,4 @@
<td colspan="7" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
\ No newline at end of file
</script>
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