提交 c3c6cd21 authored 作者: 曾从伟's avatar 曾从伟

Merge branch 'dev' of https://git.lefull.cn/yzx/lxx_pms into dev

......@@ -50,8 +50,12 @@ class CustomTemplateController extends BaseBookingWapController
$this->ajaxReturn($parameter);
}
$this->assign('parameter', $parameter['data']['parameter']);
$template_name = $parameter['data']['template_name']?$parameter['data']['template_name']:'preordainTemplate';
$this->display($parameter['data']['template_name']);
$template_html = $this->fetch($parameter['data']['template_name']);
$this->assign('contract_id', $data['contract_id']);
$this->assign('template_html', $template_html);
$this->display("preordainTemplate");
}
/**
* @version 2018年05月16日09:22:23
......@@ -97,7 +101,11 @@ class CustomTemplateController extends BaseBookingWapController
die('<h1>'.$parameter['message'].'</h1>');
}
$this->assign('parameter', $parameter['data']['parameter']);
$this->display($parameter['data']['template_name']);
$template_html = $this->fetch($parameter['data']['template_name']);
$this->assign('contract_id', $data['contract_id']);
$this->assign('template_html', $template_html);
$this->display("entrustAgreement");
}
/**
......@@ -305,7 +313,9 @@ class CustomTemplateController extends BaseBookingWapController
$this->assign('template_html', $html);
$this->display('tenancyContractTemp');
} else {
$this->display($parameter['data']['template_name']);
$html = $this->fetch($parameter['data']['template_name']);
$this->assign('template_html', $html);
$this->display('tenancyContractTemp');
}
}
......
<link rel="apple-touch-icon" href="__CDN_WEIXIN__lefull-wap/build/component/common/images/favicon.ico">
<link rel="Shortcut Icon" href="__CDN_WEIXIN__lefull-wap/build/component/common/images/favicon.ico" type="image/x-icon">
<script type="text/ecmascript" src="__CDN_WEIXIN__lefull-wap/build/lib/flexible/flexible_css.js"></script>
<script type="text/ecmascript" src="__CDN_WEIXIN__lefull-wap/build/lib/flexible/flexible.js"></script>
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/common/fonts/iconfont.css" />
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/common/css/common.css" />
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/business/css/agreementCommon.css"/>
<style>
body{
padding-top:0;
background: #ffffff;
}
.conditions{
padding-bottom:0;
height:auto;
}
.conditions div{
height:auto;
}
</style>
<section class="wraper">
<section>
<!--协议-->
<div class="conditions">
<div>{{$template_html}}</div>
</div>
</section>
</section>
<input type="hidden" name="contract_id" id="contract_id" value="{{$contract_id}}"/>
<div class="md-overlay"></div>
<script src="__CDN_WEIXIN__lefull-wap/build/lib/jquery/jquery-3.2.1.min.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/component/common/js/common.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/lib/swiper/swiper.min.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/component/index/js/index.js" type="text/javascript" rel="preload" as="script"></script>
<script type="text/javascript" rel="preload" as="script">
$(function () {
var sta = "<?php echo $parameter['is_sign'];?>";
var flag = window.location.href.split('flag=')[1];
if (flag == 'renter' && sta == 0) {
$('.ui-fixed-b').show();
$('.ui-btn-green').show();
$('.ui-bg-gray').hide();
} else if (sta == 1) {
$('.ui-fixed-b').show();
$('.ui-btn-green').hide();
$('.ui-bg-gray').show();
} else {
$('.ui-fixed-b').hide();
$('body').css('padding-bottom',0);
}
$('.ui-btn-green').on('click', function () {
if ($(this).hasClass('loading')) return;
$(this).addClass('loading');
$(this).text('签约中');
console.log(1)
$.ajax({
url: '/Business/ajaxContract',
data: {
contract_id: $('#contract_id').val(),
},
type: 'post',
success: function (json) {
if (json.status == 1) {
$('.ui-btn-green').hide();
$('.ui-bg-gray').show();
$('.ui-error').hide();
} else {
$('.ui-error').show();
}
},
error: function (json) {
$('.ui-error').show();
}
})
})
})
</script>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>《房屋租赁合同》解除协议书</title>
</head>
<style>
* {
padding: 0;
margin: 0;
font-weight: normal;
font-family: "SF Pro SC", "SF Pro Display", "SF Pro Icons",
"PingFang SC", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
}
<link rel="apple-touch-icon" href="__CDN_WEIXIN__lefull-wap/build/component/common/images/favicon.ico">
<link rel="Shortcut Icon" href="__CDN_WEIXIN__lefull-wap/build/component/common/images/favicon.ico" type="image/x-icon">
<script type="text/ecmascript" src="__CDN_WEIXIN__lefull-wap/build/lib/flexible/flexible_css.js"></script>
<script type="text/ecmascript" src="__CDN_WEIXIN__lefull-wap/build/lib/flexible/flexible.js"></script>
.ui-contract{
padding: 80px;
}
.ui-c-center{
width: 700px;
margin: 0 auto;
}
.ui-contract h1{
text-align: center;
font-size: 0.4rem ;
margin: 100px 0;
color: #252525;
}
.ui-contract h2{
text-align: center;
font-size: 0.4rem ;
margin: 100px 0;
color: #252525;
}
.ui-contract h3{
font-size: 0.4rem ;
margin: 30px 0;
color: #252525;
}
.ui-contract p{
font-size: 0.4rem ;
color: #858585;
line-height: 150%;
}
.ui-foot{
overflow: hidden;
}
.line{
text-decoration: underline;
text-align: center;
padding: 0 5px;
}
.fl{
float: left;
}
.ui-table{
border-collapse: collapse;
margin: 0 auto;
font-size: 0.4rem;
width: 800px;
}
.ui-table tr th{
height: 80px;
font-size: 0.4rem;
}
.ui-table tr td{
text-align: center;
padding: 10px 10px;
}
.txt-left{
text-align: left!important;
}
.txt-right{
text-align: right!important;
}
.txt-center{
text-align: center!important;
}
.ft-16{
font-size: 0.4rem;
}
.ui-logo{
text-align: center;
}
.ui-logo img{
width: 200px;
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/common/fonts/iconfont.css" />
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/common/css/common.css" />
<link rel="stylesheet" href="__CDN_WEIXIN__lefull-wap/build/component/business/css/agreementCommon.css"/>
}
<style>
body{
padding-top:0;
background: #ffffff;
}
.conditions{
padding-bottom:0;
height:auto;
}
.conditions div{
height:auto;
}
</style>
<body>
<div class="ui-contract">
<div class="ui-info">
<div class="ui-cover">
<div class="ui-c-center">
<h2>《房屋租赁合同》解除协议书</h2>
<h3 style="margin-top: 60px">
甲方(出租方):<span class="line">{{$parameter.jf_bot}}</span>
</h3>
<h3>&nbsp;&nbsp;&nbsp;&nbsp;号:</h3>
<section class="wraper">
<h3 style="margin-top: 60px">
乙方(承租方):<span class="line">{{$parameter.yf_bot}}</span>
</h3>
<h3>身份证号:{{$parameter.tenant_idcard}}</h3>
</div>
<p style="margin: 100px 0; text-indent: 2em">
甲、乙双方于 <span class="line">{{$parameter.begin_time_year}}</span><span
class="line">{{$parameter.begin_time_month}}</span><span
class="line">{{$parameter.begin_time_day}}</span>日签订了《房屋租赁合同》
,约定由甲方将位于<span class="line">{{$parameter.project_address}}</span>
(房屋地址)乐乎城市青年社区公寓<span class="line">{{$parameter.building}}</span>
<span class="line">{{$parameter.room_number}}</span>
号房间出租给乙方使用,乙方向甲方支付租金。双方的合作期限为<span class="line">{{$parameter.months}}</span>
月, 合同有效期为<span class="line">{{$parameter.begin_time_year}}</span>
<span class="line">{{$parameter.begin_time_month}}</span>
<span class="line">{{$parameter.begin_time_day}}</span>日 至<span
class="line">{{$parameter.end_time_year}}</span><span
class="line">{{$parameter.end_time_month}}</span><span
class="line">{{$parameter.end_time_day}}</span>日。甲乙双方经协商一致,同意提前解除本合同,根据《中华人民共和国合同法》等相关法律法规的规定,甲、乙双方本着平等、自愿、互谅互让的原则,就双方提前终止合同相关事宜达成如下条款,双方共同恪守:
</p>
<p>
一、甲、乙双方同意,提前终止双方于<span class="line">{{$parameter.now_year}}</span><span
class="line">{{$parameter.now_month}}</span><span
class="line"></span>日签订的《房屋租赁合同》 。
</p>
<p>
二、乙方在签订该协议后,于 <span class="line">{{$parameter.surrender_year}}</span>
<span class="line">{{$parameter.surrender_month}}</span><span
class="line">{{$parameter.surrender_day}}</span>
日前,按照原状返还房屋及其附属物品、设备设施。乙方不得损坏甲方原有基础装修,如有破损,修复费用由乙方承担。甲乙双方应对房屋和附属物品、设备设施及水电使用等情况进行验收,结清各自应当承担的费用。
</p>
<p></p>
<p>
三、甲方应于签定本解约协议并办理退租交房后7个工作日内,返还乙方已经支付的租金人民币 <span class="line">{{$parameter.refund_money}}</span>元、履约保证金人民币
<span class="line">{{$parameter.deposit}}</span>元、其他费用人民币
<span class="line">{{$parameter.other_money}}</span>元、共计人民币 <span
class="line">{{$parameter.total_money}}</span>元(大写: <span
class="line">{{$parameter.refund_amount}}</span>元整)。双方互不追究原租赁合同相关违约责任。
</p>
<p>四、甲乙双方应共同遵守本协议,任何一方违反本协议的约定,依法承担相应赔偿责任。</p>
<p>五、因本协议所引起的或与本协议有关的争议,双方应友好协商解决;协商不成应向甲方所在地有管辖权的人民法院提起诉讼。</p>
<p>六、本协议自双方签字之日起生效, 本协议一式三份,具有同等法律效力。</p>
<section>
<!--协议-->
<div class="conditions">
<div>{{$template_html}}</div>
</div>
</div>
</section>
</section>
<div class="ui-foot">
<h3 style="margin-top: 60px">
出租人(甲方)签字:<span class="line">{{$parameter.jf_bot}}</span>
</h3>
<h3>联系电话:{{$base_config.CFG_CALL_CENTER.zh_value}}</h3>
<h3>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:<span class="line">{{$parameter.now_year}}</span><span
class="line">{{$parameter.now_month}}</span><span
class="line">{{$parameter.now_day}}</span>
</h3>
<input type="hidden" name="contract_id" id="contract_id" value="{{$contract_id}}"/>
<h3 style="margin-top: 60px">
承租人(已方)签字:<span class="line">{{$parameter.yf_bot}}</span>
</h3>
<h3>联系电话:{{$parameter.tenant_phone}}</h3>
<h3>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:<span class="line">{{$parameter.now_year}}</span><span
class="line">{{$parameter.now_month}}</span><span
class="line">{{$parameter.now_day}}</span>
</h3>
<div class="md-overlay"></div>
</div>
</div>
</div>
<script src="__CDN_WEIXIN__lefull-wap/build/lib/jquery/jquery-3.2.1.min.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/component/common/js/common.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/lib/swiper/swiper.min.js" type="text/javascript" rel="preload" as="script"></script>
<script src="__CDN_WEIXIN__lefull-wap/build/component/index/js/index.js" type="text/javascript" rel="preload" as="script"></script>
<script type="text/javascript" rel="preload" as="script">
$(function () {
var sta = "<?php echo $parameter['is_sign'];?>";
var flag = window.location.href.split('flag=')[1];
if (flag == 'renter' && sta == 0) {
$('.ui-fixed-b').show();
$('.ui-btn-green').show();
$('.ui-bg-gray').hide();
} else if (sta == 1) {
$('.ui-fixed-b').show();
$('.ui-btn-green').hide();
$('.ui-bg-gray').show();
} else {
$('.ui-fixed-b').hide();
$('body').css('padding-bottom',0);
}
$('.ui-btn-green').on('click', function () {
if ($(this).hasClass('loading')) return;
$(this).addClass('loading');
$(this).text('签约中');
console.log(1)
$.ajax({
url: '/Business/ajaxContract',
data: {
contract_id: $('#contract_id').val(),
},
type: 'post',
success: function (json) {
if (json.status == 1) {
$('.ui-btn-green').hide();
$('.ui-bg-gray').show();
$('.ui-error').hide();
} else {
$('.ui-error').show();
}
},
error: function (json) {
$('.ui-error').show();
}
})
})
})
</script>
</body>
</html>
\ No newline at end of file
......@@ -2,7 +2,7 @@
return array(
//APP最高级别调试权限
'APP_BASE_DUBUG' => 1,
'APP_BASE_DUBUG' => 0,
//调试模式
'IS_DEBUG' => 0,
......
......@@ -194,4 +194,15 @@ class ContractController extends BaseClientController
$this->ajaxReturn($res);
}
/**
* @desc 提交续租请求
* @version 2020-06-09
* @author yzx
*/
public function createRenewals(){
$contract_id = I('contract_id');
$res = $this->logic('Api\Contract')->createRenewals($contract_id);
$this->ajaxReturn($res);
}
}
\ No newline at end of file
......@@ -69,6 +69,7 @@ class ContractLogic extends BaseLogic
$return_data[$k]['room_id'] = $v['room_id'];
$return_data[$k]['room_number'] = $v['room_number'];
$return_data[$k]['apartment_id'] = $v['apartment_id'];
$return_data[$k]['is_renewal'] = $v['is_renewal'];
//修改接口
// $return_data[$k]['apartment_name'] = $v['apartment_name'];
// $return_data[$k]['alias_info'] = $v['alias_info'];
......@@ -608,38 +609,58 @@ class ContractLogic extends BaseLogic
// 1. 租赁合同
$contract_list_tmp = [];
$contract_list = D("Contract")
->field('c.fdd_id,r.room_number')
->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
->alias('c')
->join("room as r on(r.room_id = c.room_id)","left")
->where($contract_where)
->select();
foreach ($contract_list as $k => $v){
$contract_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"租赁合同".$v['room_number'].'号'];
$contract_list_tmp[] = ['fdd_id' =>$v['fdd_id'],
'room_number' =>$v['room_number'],
'apartment_id' =>$v['apartment_id'],
'agreement_type'=>"租赁合同".$v['room_number'].'号',
'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
'begin_time' =>$v['begin_time']
];
}
// 2. 转租协议
$reservation_surrender_list_tmp = [];
$reservation_surrender_list = D("ReservationSurrender")
->field('c.fdd_id,r.room_number')
->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.create_time')
->alias('c')
->join("room as r on(r.room_id = c.room_id)","left")
->where($contract_where)
->select();
foreach ($reservation_surrender_list as $k => $v){
$reservation_surrender_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"转租协议".$v['room_number'].'号'];
$reservation_surrender_list_tmp[] = [
'fdd_id' =>$v['fdd_id'],
'room_number' =>$v['room_number'],
'apartment_id' =>$v['apartment_id'],
'agreement_type'=>"转租协议".$v['room_number'].'号',
'contract_cycle'=>date("Y.m.d",$v['create_time']).'-'.date("Y.m.d",$v['create_time']),
'begin_time' =>$v['create_time']
];
}
// 3. 合同解除协议
$surrender_list_tmp = [];
$surrender_where["s.is_sign"] = ['eq',1];
$surrender_where = array_merge($surrender_where,$contract_where);
$surrender_list = D('Surrender')
->field('s.fdd_id,r.room_number')
->field('s.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
->alias('s')
->join("contract as c on(s.contract_id = c.contract_id)","left")
->join("room as r on(c.room_id = r.room_id)","left")
->where($surrender_where)
->select();
foreach ($surrender_list as $k => $v){
$surrender_list_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"合同解除协议".$v['room_number'].'号'];
$surrender_list_tmp[] = [
'fdd_id' =>$v['fdd_id'],
'room_number' =>$v['room_number'],
'apartment_id' =>$v['apartment_id'],
'agreement_type'=>"合同解除协议".$v['room_number'].'号',
'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
'begin_time' =>$v['begin_time']
];
}
//4预定协议
$preordain_tmp = [];
......@@ -647,17 +668,38 @@ class ContractLogic extends BaseLogic
$preordain_where['c.tenant_id'] = ['eq',$tenant_id];
$preordain_where['c.company_id'] = ['neq',0];
$preordain = D("Preordain")
->field('c.fdd_id,r.room_number')
->field('c.fdd_id,r.room_number,c.contract_id,r.apartment_id,c.begin_time,c.end_time')
->alias('c')
->join("room as r on(c.room_id = r.room_id)","left")
->where($preordain_where)
->select();
foreach ($preordain as $k => $v){
$preordain_tmp[] = ['fdd_id'=>$v['fdd_id'],'room_number'=>$v['room_number'],'name'=>"定金协议".$v['room_number'].'号'];
$preordain_tmp[] = [
'fdd_id' =>$v['fdd_id'],
'room_number' =>$v['room_number'],
'apartment_id' =>$v['apartment_id'],
'agreement_type'=>"定金协议".$v['room_number'].'号',
'contract_cycle'=>date("Y.m.d",$v['begin_time']).'-'.date("Y.m.d",$v['end_time']),
'begin_time' =>$v['begin_time']
];
}
//定金协议
$data = array_merge($contract_list_tmp,$reservation_surrender_list_tmp,$surrender_list_tmp,$preordain_tmp);
return RD('成功', $data, 1);
$list_tmp = [];
$apartment_id = [];
foreach ($data as $k => $v){
$list_tmp[$v['apartment_id']][] = $v;
$apartment_id[] = $v['apartment_id'];
}
if (!empty($apartment_id)){
$apartment_where['apartment_id'] = ['in',$apartment_id];
$apartment_list = $this->helper('Apartment')->getList($apartment_where)['data'];
$apartment_list_tmp = [];
foreach ($apartment_list as $k => $v){
$apartment_list_tmp[] = ['apartment_id'=>$v['apartment_id'],'apartment_name'=>$v['apartment_name'],'contract_list'=>$list_tmp[$v['apartment_id']]];
}
}
return RD('成功', $apartment_list_tmp, 1);
}
/**
* @desc 获取租客法大大PDF签约预览地址
......@@ -683,4 +725,31 @@ class ContractLogic extends BaseLogic
return RD('获取预览连接失败');
}
/**
* @desc APP申请续租
* @param $contract_id
* @version 2020-06-09
* @author yzx
* @return array
*/
public function createRenewals($contract_id){
$contractModel = D('Contract');
$where['company_id'] = ['egt',0];
$where['contract_id'] = ['egt',$contract_id];
$info = $contractModel->where($where)->find();
$save_data['is_renewal'] = 1;
$save_data['operator_employee_id'] = $info['operator_employee_id'];
$result = $contractModel->where(['contract_id'=>$contract_id])->data($save_data)->save();
if (!$result){
return RD('申请失败');
}
$data['push_code'] = 'apply_renewals';
$data['from_client_id'] = 8;
$data['room_id'] = $info['room_id'];
$data['money'] = 0;
$result = $this->logic('Message\Message')->messageAddOne($data);
WL($result,'createRenewalsLog',1);
return RD('申请成功',[],1);
}
}
......@@ -322,7 +322,7 @@ class ContractLogic extends BaseLogic
$conWhere['surrender_time'] = 0;
}
$contract_fields = 'contract_id, room_id, begin_time, end_time, rental, is_surrender,
surrender_time, advance_pay_rent_day, renewal_contract, bill_id, paid_day';
surrender_time, advance_pay_rent_day, renewal_contract, bill_id, paid_day,is_renewal';
$contractList = $this->helper('Contract')->getList($conWhere, $contract_fields);
if (empty($contractList['data'])) {
return ['status' => 1, 'message' => '该租客没有合同', 'data' => []];
......
......@@ -454,6 +454,7 @@ class FddDataLogic extends BaseLogic
}
$parameter = [
'preordain_time' => date("Y-m-d",$preordain_info['begin_time']),
'preordain_ende_time'=> date("Y-m-d",$preordain_info['end_time']),
'project_address' => $apartment_info['data']['address'], //地址
'building' => $ridgepole_info['data']['ridgepole_number'],
'floor' => $floor_info['data']['floor_number'],
......@@ -603,6 +604,7 @@ class FddDataLogic extends BaseLogic
'rental' => $contract_info['data']['rental'],
'rental_dx' => get_amount($contract_info['data']['rental']),
'deposit' => $contract_info['data']['deposit'],
'half_deposit' => round($contract_info['data']['deposit']/2),
'deposit_dx' => get_amount($contract_info['data']['deposit']),
'fee_month' => $calculate_service_fee['data']['month_service_fee'],//月服务费
'fee_month_dx' => empty($calculate_service_fee['data']['month_service_fee']) ? '' : get_amount($calculate_service_fee['data']['month_service_fee']),//服务费大写
......@@ -622,6 +624,7 @@ class FddDataLogic extends BaseLogic
'cotenant_name' => $cotenant_info['data']['name'],
'cotenant_idcard' => $cotenant_info['data']['idcard'],
'cotenant_phone' => $cotenant_info['data']['phone'],
'yf_bot' => $tenant_info['data']['name'],//租客姓名
];
return ['status' => 1, 'message' => '获取成功', 'data' => $parameter];
}
......
ALTER TABLE `contract` ADD `is_renewal` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '是否申请续租';
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论