Skip to content

T
tl_estate
Commit 68c6f704 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 2f91c765 ed144a18
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 198 deletions
application/api/controller/ConvertOrder.php
View file @ 68c6f704
......@@ -34,6 +34,7 @@ class ConvertOrder extends Basic
private $marchInModel;
private $refundModel;
private $journalaccountsModel;
private $houseModel;
public function __construct($request = null)
{
......@@ -45,6 +46,7 @@ class ConvertOrder extends Basic
$this->marchInModel = new OMarchInModel();
$this->refundModel = new RefundTables();
$this->journalaccountsModel = new JournalAccounts();
$this->houseModel = new GHouses();
parent::__construct($request);
}
......@@ -116,10 +118,13 @@ class ConvertOrder extends Basic
ob_flush();
}
/**
* 下定
*/
public function convertCollectingBill()
{
set_time_limit(0);
$time_ = array( 'between', array( "2016-04-18 23:59:59", "2018-01-18 23:59:59" ) );
$time_ = array( 'between', array( "2016-04-18 23:59:59", "2018-04-17 23:59:59" ) );
$field = "a.type,a.moneytype,a.money,a.trademark,a.remarks,a.created,a.modified,d.id as agent_id,b.id as report_id,c.id as order_id,c.order_no";
$collectingBillList = $this->journalaccountsModel->getJournalAccountsListByStatus(1, 2000, $field, [ "a.created" => $time_ ]);
$collectingBillArr = [];
......@@ -283,8 +288,8 @@ class ConvertOrder extends Basic
*/
private function orderBin($order_no, $f_id, $house_id, $create_time, $update_time)
{
$houseModel = new GHouses();
$houseResult = $houseModel->getHouseDetail("id,internal_title", [ "id" => $house_id ]);
$houseResult = $this->houseModel->getHouseDetail("id,internal_title", [ "id" => $house_id ]);
$house_title = count($houseResult) > 0 && isset($houseResult["internal_title"]) ? $houseResult["internal_title"] : null;
$param["order_no"] = $order_no;
$param["f_id"] = $f_id;
......
application/api/controller/Member.php
View file @ 68c6f704
......@@ -217,8 +217,9 @@ class Member extends Basic
$data['status'] = 101;
$data['data'] = array();
$this->user->startTrans();
if ($phone) {
$user_data = $this->user->get(['user_phone' => $phone]);
$user_data = $this->user->findUserByPhone('*', $phone, true);
} else {
$user_data = $this->user->get($this->userId);
}
......@@ -304,9 +305,11 @@ class Member extends Basic
}
if (empty($id)) {
$this->user->rollback();
$data['status'] = 101;
$data['msg'] = '注册失败';
} else {
$this->user->commit();
$jwt_data['id'] = $id;
$jwt_data['userNick'] = $insert_data['user_nick'];
$jwt_data['phone'] = $insert_data['user_phone'];
......
application/api/controller/Shop.php
View file @ 68c6f704
......@@ -143,6 +143,8 @@ class Shop extends Basic
$param["house_id"] = $val["id"];
$param["imgtype"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
$result[$key]['title'] = $val['foreign_name'];
$result[$key]['address'] = $val['address_detail_c'];
}
if (empty($result)) {
......
application/api_broker/controller/Broker.php
View file @ 68c6f704
......@@ -199,7 +199,7 @@ class Broker extends Basic
// 查询数据集
$user_res =$user ->where('user_nick|user_phone','like',"%$phone_or_name%")
//->where('create_time','< time',$Two_days_ago)//小于两天前，即排除48小时内受保护的客户
//->whereOr('agent_id',$user_id)
// ->whereOr('agent_id',$user_id)
->limit($pagesize)
->page($pagenum)
......@@ -209,7 +209,7 @@ class Broker extends Basic
//$user_res =$user->user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum);
$total =$user ->where('user_nick|user_phone','like',"%$phone_or_name%")
//->where('create_time','< time',$Two_days_ago)
//->whereOr('agent_id',$user_id)
// ->whereOr('agent_id',$user_id)
->count();
$total = intval($total / $pagesize) + (($total % $pagesize == 0) ? 0 : 1);
......
application/index/view/finance/index.html
View file @ 68c6f704
......@@ -6,10 +6,8 @@
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li><a href="#">成交报告</a></li>
<li><a href="#">成交报告-未接单</a></li>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
......@@ -17,7 +15,7 @@
<tr>
<td colspan="9">
<a class="btn btn-info liudan_pic_btn">专员审核</a>
<a class="btn btn-default liudan_pic_btn" href="1">经理审核</a>
<a class="btn btn-default liudan_pic_btn">经理审核</a>
<a class="btn btn-default liudan_pic_btn">总监审核</a>
<a class="btn btn-default liudan_pic_btn">出纳审核</a>
......@@ -50,7 +48,7 @@
</div>
</div>
</div>
<!-- 弹出框 -->
<div class="modal fade" id="modal-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
......@@ -77,119 +75,5 @@
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!--设置案场权限人,修改盘方-->
<div class="modal fade" id="modal-anch" 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">
×
</button>
<h4 class="modal-title" id="myModalLabel">
设置案场权限人
</h4>
</div>
<div class="modal-body">
<form id="submit_agent">
<div class="jian_class">
<input name="ues_id" placeholder="请输入" type="tel" value="" class="phone_jia">
<!--号码匹配名字-->
<ul class="phone_list"></ul>
</div>
<img src="/resource/image/jia2@2x.png" class="jia">
<input type="hidden" name="ues_id" class="houseinfos_id">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_follow" data-dismiss="modal">
提交
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!--操作记录-->
<div class="modal fade" id="modal-record" 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">
×
</button>
<h4 class="modal-title">
操作记录
</h4>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">盘方修改记录</th>
<th class="text-center">操作人</th>
<th class="text-center">操作时间</th>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!--是否独家-->
<div class="modal fade" id="modal-dujia" 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">
×
</button>
<h4 class="modal-title" >
独家合同
</h4>
</div>
<div class="modal-body">
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label">是否独家：</label>
<select class="form-control btn6" id="sel_dujia">
<option value="null" class="successModel">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">独家合同上传(小于10张)：</label>
<span id="liudan_pic_pre"></span>
<input readonly="readonly" type="hidden" name="liudan_pic_pre" class="form-control btn6" placeholder="请选择图片">
<button class="btn btn-default liudan_pic_btn" id="liudan_pic_btn" type="button">选择图片</button>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">独家代理有效期：</label>
<input class="form-control btn5 " data-rule-phoneus="false" data-rule-required="false" id="start_date_dujia" name="start_date_dujia" type="date">
<span class="fore-span">-</span>
<input class="form-control btn5 " value="" data-rule-phoneus="false" data-rule-required="false" id="end_date_dujia" name="end_date_dujia" type="date">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">独家方：</label>
<input class="form-control btn6" data-rule-buga="false" data-rule-required="true" name="exclusive" placeholder="请输入姓名或手机号码" type="text" value="" id="exclusive">
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_follow2" data-dismiss="modal">
提交
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
\ No newline at end of file
<!-- -->
application/model/Users.php
View file @ 68c6f704
......@@ -428,4 +428,30 @@ class Users extends Model
->where($params)
->select();
}
/**
* 跟进用户手机号查询信息
*
* @param string $field
* @param $phone
* @param bool $lock
* @return $this|array|false|\PDOStatement|string|Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function findUserByPhone($field = '*', $phone, $lock = false) {
if ($lock) {
$data = $this->field($field)
->where('user_phone',$phone)
->lock(true)
->find();
} else {
$data = $this->field($field)
->where('user_phone',$phone)
->find();
}
return $data;
}
}
public/resource/js/reportList.js
View file @ 68c6f704
/**
* Created by 刘丹 on 2017/12/11.
*/
define(['axios', 'doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', 'pagination', 'bootstrapJs'], function(axios, doT, template) {
console.log(axios);
reportList = {
define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template) {
follow = {
pageNo: 1,
/*第几页*/
pageSize: 10,
......@@ -16,83 +11,177 @@ define(['axios', 'doT', 'text!temp/reportList_template_tpl.html', 'css!style/hom
valueCurrent: '',
ajaxObj: '',
stopstatus: true,
ldHtml: $('.phone_list'),
boxphoto: '',
init: function() {
//初始化dot
$("body").append(template);
reportList.getList(1);
reportList.event();
$(document.body).append(template);
follow.getList(0);
follow.event();
},
event: function() {
$("#search").click(function() {
follow.getList(1);
});
$("#reset").click(function() { //重置
document.getElementById("form_search").reset();
});
$ (document).delegate (".caozuo", "click", function () {//点击操作跟进详情
follow.house_id = $ (this).attr ("data-id");
follow.Caozuo();
});
$ (document).delegate (".submit_edit", "click", function () {//提交
follow.house_id = $ (this).attr ("data-id");
follow.Submit_follow();
});
$ (document).on ("input","#cus_fang", function () {//手机号搜索客方2
if($("#cus_fang").val()==''){
$(".user-ul2").html('');
}else{
follow.search_phone2();
}
});
$ (document).delegate (".addphone2", "click", function () {//list2消失
follow.addphone2(this);
});
},
addphone2:function(obj){
var user_ht=$(obj).html();
$("#cus_fang").val(user_ht);
$(".user-ul2").html('');
follow.agent_id = $ (obj).attr ("data-id");
getList: function(pageNo) {
reportList.pageNo = pageNo;
var params = {};
params.pageNo = reportList.pageNo;
params.pageSize = reportList.pageSize;
},
search_phone2:function(){//手机号
$.ajax ({
url: '/index/select_by_phone',
type: 'POST',
async: true,
data: {
"phone":$("#cus_fang").val()
},
dataType: 'json',
success: function (data) {
if (data.code == 200) {
var user_ul2 = "";
$.each(data.data, function(i,item) {
user_ul2+='<li class="addphone2" data-id="'+item.id+'">'+item.id+'-'+item.realname+'-'+item.phone+'</li>';
});
$(".user-ul2").html(user_ul2);
axios({
method:'get',
url:'/index/reportListAttache/0',
responseType:'json',
params: params,
headers: {
'Content-Type': 'application/json',
'X-Requested-With': 'XMLHttpRequest'
}
})
.then(function(response) {
console.log(response);
var temp = document.getElementById('reportList_list_tpl').innerHTML;
var doTtmpl = doT.template(temp);
$("#reportList_list").html(doTtmpl(response.data.data.list));
} else {
alert(data.msg);
}
/*分页代码*/
// PaginationX({
// 'dom': $("#pagediv")
// });
$("#pagediv").pagination({
length: response.data.data.total,
current: pageNo,
every: reportList.pageSize,
onClick: function(el) {
console.log(el);
reportList.getList(el.num.current);
}
});
},
Caozuo:function(){//获取跟进详情的数据
$.ajax({
'type': 'GET',
'url' : '/index/reportListAttache/0',
data: {"user_id":follow.house_id},
dataType: "json",
success: function(data){
if(data.code == 200){
if (data.data) {
$("#cus_id").html(data.data.user_info.user_id);//客户编号
$("#cus_name").val(data.data.user_info.user_nick);//姓名
$("#sex").val(data.data.user_info.sex);//性别
$("#cus_phone").html(data.data.user_info.user_phone);//电话
$("#cus_date").html(data.data.user_info.create_time);//上传时间
$("#cus_fang").val(data.data.user_info.agentinfo);//客方
var caozuo_table="";
$.each(data['data']['user_date'], function(i, item) {
console.log(item)
caozuo_table +='<tr><td>'+item.content+'</td><td>'+item.agentinfo+'</td><td>'+item.create_time+'</td></tr>';
});
$("#caozuo_table").html(caozuo_table);
}
} else {
alert('获取失败！');
}
});
})
.catch(function(error) {
console.log(error);
}
});
},
// $.ajax({
// url: '/index/reportListAttache/0', //获取列表
// type: 'GET',
// async: true,
// data: params,
// dataType: 'json',
// success: function(data) {
// var temp = document.getElementById('reportList_list_tpl').innerHTML;
// var doTtmpl = doT.template(temp);
// $("#reportList_list").html(doTtmpl(data.data.list));
//
// /*分页代码*/
// $("#pagediv").pagination({
// length: data.data.total,
// current: pageNo,
// every: reportList.pageSize,
// onClick: function(el) {
// reportList.getList(el.num.current);
// }
// });
// }
// });
}
Submit_follow: function() { //提交
$.ajax({
'type': 'POST',
'url': '/index/pcEditClient',
data: {
"id": follow.house_id,
"user_nick": $("#cus_name").val(),
"user_phone": $("#cus_phone").html(),
"agent_id":follow.agent_id,//客方
"sex": $("#sex").val()
},
dataType: "json",
success: function(data) {
if(data.code == 200) {
if(data.data) {
}
} else {
}
}
});
},
getList: function(pageNo) {
console.log($('#customer_name').val());
follow.pageNo = pageNo;
var params = {};
params.user_name =$('#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.pageNo = follow.pageNo;
params.pageSize = follow.pageSize;
$.ajax({
type: 'GET',
url: '/index/reportListAttache/0',
data: params,
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(data) {
console.log(data,666)
if(typeof data === 'object') {
if (data.code == 200) {
var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML);
$("#follow_list").html(doTtmpl(data.data.list));
/*分页代码*/
$("#pagediv").pagination({
length:data.data.total,
current: pageNo,
every: follow.pageSize,
onClick: function(el) {
follow.getList(el.num.current);
}
});
}else {
alert(data['msg']);
};
}else{
alert('数据错误');
};
},
error: function() {
alert('error');
},
complete: function(xhr, textStatus){
if(textStatus === 'timeout'){
alert('请求超时');
};
}
});
}
};
return reportList;
return follow;
});
\ No newline at end of file
public/resource/js/user.js
View file @ 68c6f704
......@@ -53,10 +53,12 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
$("input[name = 'user_status']:checked").attr("checked",true);
user.getGenjinLabel();
});
// ===========================新增客户====================
$ (document).delegate ("#add_user", "click", function () {//新增客户
user.user_id = $ (this).attr ("data-id");
user.add_user();
});
$ (document).delegate ("#edit_add", "click", function () {
user.edit_add();
});
......@@ -202,6 +204,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
}
});
},
// ====================新增客户页面==================
Caozuo:function(){//获取跟进详情的数据
$.ajax({
'type': 'GET',
......@@ -264,6 +267,12 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
user.getList (el.num.current);
}
});
$("#total_page").html(data.data.total);
console.log(data.data.total);
console.log(user.pageSize);
console.log(pageNo);
}
});
},
......
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