|
@@ -32,7 +32,7 @@
|
|
|
keyName="dictValue"
|
|
|
:valuea="datainfo.tenantId"
|
|
|
:chosevalue="tenantName?tenantName:statusFormats(datainfo.tenantId,voList,'tenant')"
|
|
|
- :isdisabled="(ptype=='edit'&&datainfo.examine!='3')?true:false"
|
|
|
+ :isdisabled="(ptype=='edit'&&datainfo.examine=='2')?true:false"
|
|
|
:filterable="filterable"
|
|
|
@change='getchangea'
|
|
|
>
|
|
@@ -48,6 +48,7 @@
|
|
|
keyName="dictValue"
|
|
|
:valuea="datainfo.houseId"
|
|
|
:chosevalue="datainfo.detailedAddress"
|
|
|
+ :isdisabled="(ptype=='edit'&&datainfo.examine=='2')?true:false"
|
|
|
:filterable='filterable'
|
|
|
@change='getchange'
|
|
|
>
|
|
@@ -320,7 +321,7 @@
|
|
|
"residentName":null,//居住人员姓名
|
|
|
"residentPhone":null,//人员手机号
|
|
|
"houseInfoRedidentList":[],//用户房屋信息集合
|
|
|
- "houseId":null,//关联房屋信息表的house_id
|
|
|
+ "houseId":'',//关联房屋信息表的house_id
|
|
|
"residentRelationship":null,//居住人员与户主的关系,如父子、夫妻等
|
|
|
"isHouseholder":null,//是否是户主 N不是 Y是
|
|
|
|
|
@@ -516,6 +517,11 @@
|
|
|
var tenantId=this.datainfo.tenantId;
|
|
|
this.datainfo.tenantId=e.dictValue;
|
|
|
this.houserinfo.communityName=e.dictLabel;
|
|
|
+ this.datainfo.houseId="";
|
|
|
+ this.datainfo.detailedAddress='';
|
|
|
+ this.houserinfo.detailedAddress='';
|
|
|
+ this.houserinfo.houseId="";
|
|
|
+ this.houserinfo.location='';
|
|
|
// 业主或租户
|
|
|
this.listNoPageTenant(e.dictValue)
|
|
|
},
|
|
@@ -744,6 +750,10 @@
|
|
|
this.$toast('请选择小区名称')
|
|
|
return
|
|
|
}
|
|
|
+ if((params.residentType==1||params.residentType==2)&&!params.houseId){
|
|
|
+ this.$toast('请选择房屋号')
|
|
|
+ return
|
|
|
+ }
|
|
|
if(params.residentType==1&¶ms.isHouseholder=='Y'){
|
|
|
var houserinfo=JSON.parse(JSON.stringify(this.houserinfo))
|
|
|
if(!houserinfo.location){
|
|
@@ -764,7 +774,7 @@
|
|
|
params.houseInfoRedidentList=JSON.parse(JSON.stringify(newarr))
|
|
|
}
|
|
|
if(params.residentType==2){
|
|
|
- params.isTenant='Y'
|
|
|
+ params.isTenant='Y';
|
|
|
}else{
|
|
|
params.isTenant=''
|
|
|
}
|