Skip to content

M
mobi
Commit 6cf000a5 authored by yulunyao's avatar yulunyao
Browse files
Options

Merge branch 'xuhui' into dev

parents 1e46c158 f7959098
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 71 deletions
src/views/houseData/basicInfo.vue
View file @ 6cf000a5
......@@ -348,7 +348,7 @@ export default {
'c.hoId': !this.form.getFieldValue('c.hoId')?'':this.form.getFieldValue('c.hoId').split('#')[1],
'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1],
'stKind_in': !this.form.getFieldValue('stKind_in')?'':this.form.getFieldValue('stKind_in').join(','),
'unitAddr': !this.form.getFieldValue('unitAddr')?'' : this.form.getFieldValue('unitAddr'),
'unitAddr': !this.form.getFieldValue('unitAddr')?'':this.form.getFieldValue('unitAddr'),
'sectType_in': '1',
'c.createTime_desc': 'desc'
}, obj, isHocId)// 融合obj 和isHocId 到入参
......
src/views/houseData/basicView.vue
View file @ 6cf000a5
......@@ -26,7 +26,7 @@
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区别名"' :text='detail.stNameScnd '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区别名"' :text='detail.stNameScnd'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
......@@ -46,37 +46,35 @@
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"总门牌数"' :text='detail.totUnits '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（多层）"' :text='detail.stMultilayerStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"总户数"' :text='detail.totHous '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（高层）"' :text='detail.stTopStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业服务合同开始日期"'
:text='detail.cspContractStartDate&& detail.cspContractStartDate!= " " && detail.cspContractStartDate.slice(0,4)+ "-"+ detail.cspContractStartDate.slice(4,6)+"-"+detail.cspContractStartDate.slice(6,8)'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（别墅）"' :text='detail.stVillaStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业服务合同结束日期"' :text='
detail.cspContractEndDate&&detail.cspContractEndDate.slice(0,4)+ "-"+ detail.cspContractEndDate.slice(4,6)+"-"+detail.cspContractEndDate.slice(6,8)'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（售后）"' :text='detail.stAfterStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"有无历保建筑"' :text='detail.haveHistoryBuilding'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"历保地址"' :text='detail.hbAddr'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"住宅总建筑面积"' :text='detail.resiBuildingAreaTotal'></DetailsItem>
</a-col>
......@@ -85,8 +83,8 @@
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"住宅总套数"' :text='detail.resiTotal'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"非住宅总套数"' :text='detail.nonResiTotal'></DetailsItem>
</a-col>
......@@ -110,12 +108,12 @@
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵数量"' :text='detail.febInfo&&detail.febInfo.firePumpNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'></DetailsItem>
</a-col>
</a-row>
</a-row> -->
</a-col>
<a-col span="8">
......@@ -124,11 +122,6 @@
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区封闭与否"' :text='detail.isOpen && detail.isOpen ? "是":"否"'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine" >
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"归属区县"' :text='detail.hpbName '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"房管办"' :text='detail.hoName '></DetailsItem>
......@@ -136,7 +129,7 @@
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"街道"' :text='detail.strName'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"街道"' :text='detail.streetName'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
......@@ -169,17 +162,17 @@
<DetailsItem :labelSpan='12' :textSpan="12" :label='"四至不包括"' :text='detail.stNotcsparea '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"地面机动车库数量"' :text='detail.totOngParks'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"地下机动车库数量"' :text='detail.totUngParks'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"机械车库数量"' :text='detail.febInfo && detail.febInfo && detail.febInfo.mechGarageNum'></DetailsItem>
</a-col>
......@@ -213,7 +206,7 @@
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水生活总泵数量"' :text='detail.febInfo&&detail.febInfo.waterPumpNum'></DetailsItem>
</a-col>
</a-row>
</a-row> -->
</a-col>
<a-col span="8">
......@@ -244,50 +237,40 @@
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"占地面积"' :text='detail.stLandArea'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"占地面积"' :text='detail.landArea'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（多层）"' :text='detail.stMultilayerStandard'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"总门牌数"' :text='detail.totUnits'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（高层）"' :text='detail.stTopStandard'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"总户数"' :text='detail.totHous'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（别墅）"' :text='detail.stVillaStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"收费标准（售后）"' :text='detail.stAfterStandard'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"生活垃圾库房"' :text='detail.febInfo && detail.febInfo.domesticGarbageWarehouse'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑垃圾库房"' :text='detail.febInfo && detail.febInfo.constructionWasteWarehouse'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"供水消防总泵维保单位"' :text='detail.febInfo && detail.febInfo.firePumpNum'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"监控主控室位置"' :text=' detail.febInfo && detail.febInfo.monitoringRoomPosition'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"非产权车位(机械)"' :text=' detail.nonTitleParkMech'></DetailsItem>
</a-col>
......@@ -306,12 +289,12 @@
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"其他总建筑面积"' :text='detail.ohterBuildingAreaTotal'></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'></DetailsItem>
</a-col>
</a-row>
</a-row> -->
</a-col>
</a-row>
......@@ -392,6 +375,12 @@
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业企业办公地址"' :text='ppInfo.cspAddr '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业服务合同结束日期"' :text='
detail.cspContractEndDate&&detail.cspContractEndDate.slice(0,4)+ "-"+ detail.cspContractEndDate.slice(4,6)+"-"+detail.cspContractEndDate.slice(6,8)'></DetailsItem>
</a-col>
</a-row>
</a-col>
<a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine">
......@@ -413,9 +402,15 @@
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业服务合同开始日期"'
:text='detail.cspContractStartDate&& detail.cspContractStartDate!= " " && detail.cspContractStartDate.slice(0,4)+ "-"+ detail.cspContractStartDate.slice(4,6)+"-"+detail.cspContractStartDate.slice(6,8)'></DetailsItem>
</a-col>
</a-row>
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'></DetailsItem>
</a-col>
</a-row> -->
</a-col>
</a-row>
</div>
......@@ -453,28 +448,33 @@
<DetailsItem :labelSpan='12' :textSpan="12" :label='"资格证书编号"' :text='cmInfo.csmJobLog '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理证件号码"' :text='cmInfo.credentialsNo '></DetailsItem>
</a-col>
</a-row>
</a-row> -->
</a-col>
<a-col span="8">
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理固定电"' :text='cmInfo.csmTel '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理固定电话"' :text='cmInfo.csmTel '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理手机"' :text='cmInfo.csmPhone '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理证件号码"' :text='cmInfo.credentialsNo '></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start" class="detailsPartLine">
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"小区经理手机"' :text='cmInfo.csmPhone '></DetailsItem>
</a-col>
</a-row> -->
<!-- <a-row type="flex" justify="start" class="detailsPartLine">
<a-col span="24">
<DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'></DetailsItem>
</a-col>
</a-row>
</a-row> -->
</a-col>
</a-row>
</div>
......@@ -565,28 +565,28 @@
</div>
</div>
<!-- 业委会信息 -->
<div class="layoutMargin detailsPartSection" v-if="!!rcInfo">
<div class="layoutMargin detailsPartSection">
<p id="cmtInfo" class="detailsPartTitle">居委会信息</p>
<div style="margin:0 16px;">
<a-row type="flex" justify="start">
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会名称"' :text='rcInfo.cmtName '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会名称"' :text="!!rcInfo?rcInfo.cmtName:''"></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会地址"' :text='rcInfo.cmtAddr '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会地址"' :text="!!rcInfo?rcInfo.cmtAddr:''"></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委主任姓名"' :text='rcInfo.cmtDirectorName '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委主任姓名"' :text="!!rcInfo?rcInfo.cmtDirectorName:''"></DetailsItem>
</a-col>
</a-row>
<a-row type="flex" justify="start">
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委书记姓名"' :text='rcInfo.cmtSecretaryName '></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan="12" :label='"居委书记姓名"' :text="!!rcInfo?rcInfo.cmtSecretaryName:''"></DetailsItem>
</a-col>
</a-row>
</div>
</div>
<!-- 自定义字段 -->
<div class="layoutMargin detailsPartSection" v-if="customKeyEnable == 'true' && extList.length>0">
<p id="extList" class="detailsPartTitle">拓展信息</p>
......@@ -654,6 +654,7 @@ export default {
this.$router.back()
}
},
determineRc() {},
//获取详情
getList(){
this.$ajax.get({
......
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