Skip to content

T
tl_estate
Commit 2fd0382e authored by zw's avatar zw
Browse files
Options

Merge branch '0213-v3.0.7' of https://gitee.com/zwyjjc/tl_estate into 0213-v3.0.7

parents e4c477bc 13c8fe7a
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 44 deletions
application/index/controller/Finance.php
View file @ 2fd0382e
......@@ -2622,7 +2622,8 @@ class Finance extends Basic
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
} else {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
$list[$k]['is_adjustment'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$k]['is_adjustment'] = $source_id ? 1 : 0;
}
$num = $m_refund->getFind('id',['pay_log_id'=>$v['id'],'is_del'=>0]);
......@@ -2984,6 +2985,14 @@ class Finance extends Basic
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $pay_data['id']]);
$pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$m_refund = new ORefundModel();
$num = $m_refund->getFind('id',['pay_log_id'=>$pay_data['id'],'is_del'=>0]);
if ($num['id'] > 0) {
$pay_data['is_refund'] = 1;
} else {
$pay_data['is_refund'] = 0;
}
$m_agent_house = new GHousesToAgents();
$m_store = new AStore();
$m_report = new OReportModel();
......@@ -3585,10 +3594,12 @@ class Finance extends Basic
$agent_fee = $this->sumPayLogPriceByType(1, 1);//意向金转中介费
$case_fee = $this->sumPayLogPriceByType(2, 1);//意向金转案场费
$intention_fee = $this->sumPayLogPriceByType(3, 1);//意向金转意向金
$custody_fee = $this->sumPayLogPriceByType(7, 1);//意向金转保管金
//意向金转意向金+意向金转中介费+意向金转案场费
$data['intention_adjustment'] = $agent_fee + $case_fee + $intention_fee;//意向金调整
$data['intention_adjustment'] = $agent_fee + $case_fee + $intention_fee + $custody_fee;//意向金调整
$data['intention_refund'] = $this->sumPayLogRefundByType(0, 0, 0);//意向金退款
$data['intention_refund'] += $this->sumPayLogRefundByType(1, 0, 0);//意向金退款
$data['intention_refund'] = round($data['intention_refund'], 2);
//意向金入账-意向金调整-意向金退款
$data['total_intention_recorded'] = $data['intention_recorded'] - $data['intention_adjustment'] - $data['intention_refund']; //账上意向金
......@@ -3605,6 +3616,7 @@ class Finance extends Basic
//待处理款项总计：未开业佣金+账上意向金+账上保管金
$data['wait_total_fee'] = $data['not_open_commission'] + $data['total_intention_recorded'] + $data['total_custody_recorded'];
$data['wait_total_fee'] = round($data['wait_total_fee'], 2);
return $this->response( 200, '', $data);
}
......@@ -4027,7 +4039,8 @@ class Finance extends Basic
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
} else {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
$list[$k]['is_adjustment'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$k]['is_adjustment'] = $source_id ? 1 : 0;
}
$num = $m_refund->getFind('id',['pay_log_id'=>$v['id'],'is_del'=>0]);
......
application/index/controller/Supervise.php
View file @ 2fd0382e
......@@ -70,7 +70,7 @@ class Supervise extends Basic
}
$visit = new AgentsVisitors();
$fields = 'a.id,created,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks';
$fields = 'a.id,a.create_time,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks';
$where['visit_type'] = 0;
$data['data'] = $visit->getVisitorsList($pageNo, $pageSize, 'a.id desc', $fields, $where);
......
application/index/controller/Transfer.php
View file @ 2fd0382e
......@@ -79,19 +79,20 @@ class Transfer extends Basic
if($params['agent_type'] == 1){
$where['c.agent_id'] = array('gt',0);
}else{
$where['c.agent_id'] = 0;
$where[] = ['EXP', 'c.agent_id IS NULL OR c.agent_id = 0'];
}
}
}
$sublet = new SubletModel();
$fields = 'a.id,a.shop_name,a.manage_type,a.address_detail,a.province,a.city,a.district,FORMAT(a.expected_rent/100,2) as expected_rent,
if(b.status=2,"3",a.status) as status,a.appellation,a.tel,a.create_time,a.status';
$data['list'] = $sublet->getSublet($pageNo, $pageSize, 'a.id desc', $fields, $where);
$data['total'] = $sublet->getSubletTotal($where);
return $this->response($data['status'], $data['msg'], $data);
}
......
application/index/view/marchin/marchin_list.html
View file @ 2fd0382e
......@@ -32,6 +32,9 @@
height: 30px;
/*border-radius: 15px;*/
}
#preview img{
width: 388px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -134,7 +137,7 @@
<td>{1}</td>
<td>{2}</td>
<td>
<img src='{5}' class="diagram-image J_preview"
<img src='{5}' class="diagram-image J_preview no-scroll-page-img"
data-bimg='{5}'>
</td>
<td>{4}</td>
......
application/index/view/news/new_text.html
View file @ 2fd0382e
......@@ -341,7 +341,7 @@
<input type="file" id="file_input" class="" data-limittop="10" /> <!--修改上传文件的最大数字-->
<button class="btn btn-default">选择附件</button>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
<ul class="img-pre-ul" id="fujian_ul_liu"></ul>
<p class="text-danger">保存成功后,点击文件名称即可下载</p>
</div>
</div>
......
application/index/view/transfer/index.html
View file @ 2fd0382e
......@@ -47,19 +47,19 @@
class="glyphicon glyphicon-calendar"></span></span>
</div>
</div>-->
<span class="fore-span ld-Marheight">提交时间:</span>
<!--<span class="fore-span ld-Marheight">提交时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" 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_date" type="date">
<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="name" placeholder="客户姓名"
type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="phone" placeholder="手机号" type="text"
value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="shop_name" placeholder="店铺名"
type="text" value="">
type="text" value="">-->
<select class="form-control btn2 ld-Marheight" id="is_guest">
<option value="">是否有客方</option>
<option value="1">是</option>
......@@ -75,7 +75,7 @@
</td>
</tr>
<tr>
<th class="text-center">店铺名</th>
<!--<th class="text-center">店铺名</th>-->
<th class="text-center">称呼</th>
<th class="text-center">客户电话</th>
<th class="text-center">经营业态</th>
......
application/index/view/transfer/myTransferList.html
View file @ 2fd0382e
......@@ -47,26 +47,26 @@
class="glyphicon glyphicon-calendar"></span></span>
</div>
</div>-->
<span class="fore-span ld-Marheight">提交时间:</span>
<!--<span class="fore-span ld-Marheight">提交时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" 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_date" type="date">
<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="name" placeholder="客户姓名"
type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="phone" placeholder="手机号" type="text"
value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="shop_name" placeholder="店铺名"
type="text" value="">
type="text" value="">-->
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="form_search_reset">重置</span>
</form>
</td>
</tr>
<tr>
<th class="text-center">店铺名</th>
<!--<th class="text-center">店铺名</th>-->
<th class="text-center">称呼</th>
<th class="text-center">客户电话</th>
<th class="text-center">经营业态</th>
......
application/model/AgentsVisitors.php
View file @ 2fd0382e
......@@ -5,6 +5,8 @@ namespace app\model;
class AgentsVisitors extends BaseModel
{
protected $table = 'a_visiting';
/**
* @param int $pageNo
* @param int $pageSize
......
application/model/SubletModel.php
View file @ 2fd0382e
......@@ -54,6 +54,7 @@ class SubletModel extends BaseModel
->limit($pageSize)
->page($pageNo)
->select();
big_log($this->getLastSql());
return $result;
}
......@@ -65,10 +66,12 @@ class SubletModel extends BaseModel
*/
public function getSubletTotal($params)
{
return $this->alias("a")
$result = $this->alias("a")
->join("g_houses b","a.house_id=b.id","left")
->join("u_users c", "a.user_id = c.id", "left")
->where($params)->count();
->where($params)
->count();
return $result;
}
/**
......
public/app/dist/index.html
View file @ 2fd0382e
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.8e7a1294243657c878b001aee61ce09a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.b438912f1795b396e5e3.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.8e7a1294243657c878b001aee61ce09a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.e7ca0de709b306c7ceae.js></script></body></html>
\ No newline at end of file
public/app/js/common.js
View file @ 2fd0382e
......@@ -11,6 +11,7 @@ if(~ServerHost.indexOf('run.tonglianjituan.com')){
};
if(~ServerHost.indexOf('api.tonglianjituan.com')){
ServerHostTempC = 'https://api.tonglianjituan.com';
ServerHostTempCLiu = 'https://images.tonglianjituan.com';
};
//从location.href里获取参数
function getUrlParam(name) {
......
public/app/js/daily_achieve_dz.js
View file @ 2fd0382e
......@@ -190,7 +190,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
//type 0是周报，1是日报
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/weekWorkImg',
url: ServerHostTempCLiu + '/broker/weekWorkImg',
//url: '/broker/weekWorkImg',
data: {
'agent_id': _this.userId,
......
public/app/js/daily_achieve_mdzj.js
View file @ 2fd0382e
......@@ -172,7 +172,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
//type 0是周报，1是日报
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/weekWorkImg',
url: ServerHostTempCLiu + '/broker/weekWorkImg',
//url: '/broker/weekWorkImg',
data: {
'agent_id': _this.userId,
......
public/app/js/daily_achieve_ywy.js
View file @ 2fd0382e
......@@ -174,7 +174,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
//type 0是周报，1是日报
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/weekWorkImg',
url: ServerHostTempCLiu + '/broker/weekWorkImg',
//url: '/broker/weekWorkImg',
data: {
'agent_id': _this.userId,
......
public/app/js/weekly_achieve_dz.js
View file @ 2fd0382e
......@@ -310,7 +310,7 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
//house_id 在组长和市场部总监时传的是楼盘id集合，在组员，案场经理，置业顾问时传的是0
//type 传1代表的是日报，不传或传0代表的是周报
$.ajax({
url: ServerHostTempC + "/broker/weekWorkImg",
url: ServerHostTempCLiu + "/broker/weekWorkImg",
type: 'POST',
data: {
'img': img,
......
public/app/js/weekly_achieve_mdzj.js
View file @ 2fd0382e
......@@ -612,7 +612,7 @@ $(function() {
];
$.ajax({
url: ServerHostTempC + "/broker/weekWorkImg",
url: ServerHostTempCLiu + "/broker/weekWorkImg",
type: 'POST',
data: {
'img': img,
......
public/appnew/src/assets/js/public.js
View file @ 2fd0382e
//公用js文件
let ServerHost = 'https://pre2.tonglianjituan.com';
//let ServerHost = 'https://api.tonglianjituan.com';
let ServerHostImageLiu = 'http://images.tonglianjituan.com';
if(location.origin === 'https://api.tonglianjituan.com') {
ServerHost = location.origin;
};
let ServerHostImageLiu = 'http://images.tonglianjituan.com';
};
import axios from 'axios';
import '@/assets/js/layer041002.js';
export default {
......
public/resource/js/getCollection.js
View file @ 2fd0382e
......@@ -1353,6 +1353,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
doc.find("#fenhong").val(data.is_dividend);
doc.find('#pinpai').text(data.industry_type);
var source_id = data.source_id ;
var is_refund = data.is_refund ;
if (data.source == 0) {
$("#comes").text('APP');
// doc.find("#status").text("正常");
......@@ -1371,15 +1372,19 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
$('#payNo').removeAttr("readonly");
// doc.find("#status").text("正常");
} else {
$("#comes").text('调整');
$("#comes").text('正常收款');
$('#intoPrice').attr("readonly" , "readonly");
$('#shoutiao').attr("readonly" , "readonly");
// $('#payType').attr("readonly" , "readonly");
$("#payType").attr("disabled","disabled").css("background-color","#EEEEEE;");
$('#payNo').attr("readonly" , "readonly");
}
if ( source_id ) {
if ( source_id && is_refund) {
doc.find("#status").text("被调整+被退款");
} else if (source_id){
doc.find("#status").text("被调整");
} else if (is_refund){
doc.find("#status").text("被退款");
} else {
doc.find("#status").text("正常");
}
......
public/resource/js/marchinList.js
View file @ 2fd0382e
......@@ -219,6 +219,8 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', "datetimepick
/*分页代码*/
add_page(data.data.total,pageNo,follow.pageSize,follow.getList);
$('.J_preview').preview();
}
}(0);
......
public/resource/js/schoolBusinessNew.js
View file @ 2fd0382e
......@@ -346,7 +346,7 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
for ( var i = 0 ; i < file_paths.length ; i++ ){
console.log(file_paths[i]['file_name'])
var _tempArr = file_paths[i]['file_name'].split('/');
file_paths[i]['file_name'] && $('#fujian_ul').append('<li class="pdf-pre-li" id='+file_paths[i]['file_id'] +'><a class="pdf-pre-a pdf-pre-a-download" download="{1}" href="javascript:;" title="点击可下载">{2}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
file_paths[i]['file_name'] && $('#fujian_ul_liu').append('<li class="pdf-pre-li" id='+file_paths[i]['file_id'] +'><a class="pdf-pre-a pdf-pre-a-download" download="{1}" href="javascript:;" title="点击可下载">{2}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': '/' + file_paths[i]['show_file'],
'1': dealFileName(decodeURI(_tempArr[_tempArr.length-1])),
'2': file_paths[i]['file_former_name']?file_paths[i]['file_former_name']:dealFileName(decodeURI(_tempArr[_tempArr.length-1]))
......@@ -424,7 +424,7 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
_data.content = _dajiangtangVal;
//附件相关
var _fujianObj = $('#fujian_ul').find('li>a.pdf-pre-a'); //附件看的是删除按钮的个数
var _fujianObj = $('#fujian_ul_liu').find('li>a.pdf-pre-a'); //附件看的是删除按钮的个数
if ( _fujianObj.length > 0 ){ //判断附件存在,同时,附件可能存在0到5个
for ( var i= 0 ; i < _fujianObj.length ; i++ ){
var one_name = _fujianObj[i].getAttribute('data-filename'); //附件取得是data-filename
......
public/resource/js/waitBackout.js
View file @ 2fd0382e
......@@ -57,7 +57,7 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList
//时间轴按钮
_doc.on("click", ".timeline", function() {
bargain.Timeline();
// bargain.Timeline();
});
//撤销成交报告 按钮 获取成交报告id
_doc.on("click", ".backNormal", function() {
......@@ -93,7 +93,6 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList
e.stopPropagation();
var _this = $(this);
var _id = _this.closest('tr').data('orderid');
console.log(_id);
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
});
......
public/resource/lib/js/blow-up.js
View file @ 2fd0382e
......@@ -19,7 +19,7 @@
padding:"4px",
border:"1px solid #f3f3f3",
backgroundColor:"#eeeeee",
top:show_y + "px",
top: h/4+ "px",
left:show_x + "px",
zIndex:1000
});
......@@ -28,11 +28,12 @@
backgroundColor:"white",
border:"1px solid #cccccc"
});
if (show_y + 230 > h + scroll_y) {
$("#preview").css("bottom", h - show_y - $(this).height() + "px").css("top", "auto");
} else {
$("#preview").css("top", show_y + "px").css("bottom", "auto");
}
// if (show_y + 421 > h + scroll_y) {
// $("#preview").css("bottom", h - show_y - $(this).height() + "px").css("top", "auto");
// } else {
// $("#preview").css("top", show_y + "px").css("bottom", "auto");
// }
$("#preview").fadeIn("fast")
},function(){
$("#preview").remove();
......
public/resource/template/marchin_list_template_tpl.html
View file @ 2fd0382e
......@@ -8,8 +8,8 @@
<td>[%= it[item]['report_agent_name'] %]</td>
<td>[%= adressDeal(it[item]['latitude'],it[item]['longitude'],it[item]['march_in_area']) %]</td>
<td>
<img src='[%=ServerHostImageLiuHttp+"/static/chat_image/"+it[item]["march_in_img"] %]' class="diagram-image J_preview"
data-bimg='[%=ServerHostImageLiuHttp+"/static/chat_image/"+it[item]["march_in_img"] %]'>
<img src='[%=ServerHostImageLiu+"/static/chat_image/"+it[item]["march_in_img"] %]' class="J_preview"
data-bimg='[%=ServerHostImageLiu+"/static/chat_image/"+it[item]["march_in_img"] %]'>
</td>
<td>
[% if (check_auth('marchIn_timer_shaft')) { %]
......
public/resource/template/my_transfer_template_tpl.html
View file @ 2fd0382e
......@@ -2,7 +2,7 @@
[% if(it) { %]
[% for(var item in it){ %]
<tr>
<td>[%= it[item]["shop_name"] %]</td>
<!--<td>[%= it[item]["shop_name"] %]</td>-->
<td>[%= it[item]["appellation"] %]</td>
<td>[%= it[item]["tel"] %]</td>
<td>
......
public/resource/template/transfer_template_tpl.html
View file @ 2fd0382e
......@@ -2,7 +2,7 @@
[% if(it) { %]
[% for(var item in it){ %]
<tr>
<td>[%= it[item]["shop_name"] %]</td>
<!--<td>[%= it[item]["shop_name"] %]</td>-->
<td>[%= it[item]["appellation"] %]</td>
<td>[%= it[item]["tel"] %]</td>
<td>
......
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