Skip to content

M
multiSystem
Commit 37c6cb55 authored by 程卓's avatar 程卓
Browse files
Options

拓展字段参数修改

parent 54c60f6e
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
src/server/api.js
View file @ 37c6cb55
......@@ -62,9 +62,9 @@ case 'huangpu-prod':
default: // 默认环境下（开发环境）
// BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://211.136.105.193/apiv2'
BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
// BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
// BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
// BASE_URL = 'http://211.136.105.193/api/v2'
BASE_URL = 'http://211.136.105.193/apiv2'
// MOCK_URL = 'https://yapi.omniview.pro/mock/278'
break
......
src/views/houseData/basicInfo.vue
View file @ 37c6cb55
......@@ -50,7 +50,7 @@
</a-col>
<a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="物业合同服务到期日" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-date-picker placeholder="请选择查询内容" v-decorator="['cspEndTime_btw']" />
<a-date-picker placeholder="请选择查询内容" v-decorator="['cspContractEndDate_lt']" />
</a-form-item>
</a-col>
<a-col span="8">
......@@ -533,7 +533,7 @@ export default {
// 'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
'finishDate_lt': this.isBeforeTwoThousand == '1' ? '2020-01-01':'',
'finishDate_gt': this.isBeforeTwoThousand == '2' ? '2020-01-01':'',
'cspEndTime_btw': !!this.form.getFieldValue('cspEndTime_btw') ? this.$moment(this.form.getFieldValue('cspEndTime_btw')).format('YYYY-MM-DD') : ''
'cspContractEndDate_lt': !!this.form.getFieldValue('cspContractEndDate_lt') ? this.$moment(this.form.getFieldValue('cspContractEndDate_lt')).format('YYYY-MM-DD') : ''
}, obj, isHocId)// 融合obj 和isHocId 到入参
searchParams[this.personalizedKey] = !this.formed?'': this.formed
......
src/views/houseData/basicView.vue
View file @ 37c6cb55
......@@ -134,7 +134,7 @@
</a-col>
<!-- 自定义字段 -->
<a-col span="8" v-for="i in extList['tbl_community_amst_office']" :key="i.id">
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='detail[i.keyCode]'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='caoInfo[i.keyCode]'></DetailsItem>
</a-col>
</a-row>
</div>
......@@ -148,7 +148,8 @@
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业企业名称"' :text='ppInfo.cspName '></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业企业办公地址"' :text='ppInfo.cspAddr '></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-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"物业服务合同结束日期"' :text='
......@@ -163,13 +164,13 @@
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan="12" :label='"企业联系人"' :text='ppInfo.cspContacter '></DetailsItem>
</a-col>
<a-col span="8">
<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='ppInfo.cspAddr '></DetailsItem>
</a-col>
<!-- 自定义字段 -->
<a-col span="8" v-for="i in extList['tbl_prop_company']" :key="i.id">
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='detail[i.keyCode]'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='ppInfo[i.keyCode]'></DetailsItem>
</a-col>
</a-row>
</div>
......@@ -202,7 +203,7 @@
</a-col>
<!-- 自定义字段 -->
<a-col span="8" v-for="i in extList['tbl_community_manager']" :key="i.id">
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='detail[i.keyCode]'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='cmInfo[i.keyCode]'></DetailsItem>
</a-col>
</a-row>
</div>
......@@ -225,6 +226,9 @@
<DetailsItem :labelSpan='12' :textSpan='12' :label='"选举时间"' :text='icInfo.electionDate&&
icInfo.electionDate.slice(0,4)+ "-"+ icInfo.electionDate.slice(4,6)+"-"+icInfo.electionDate.slice(6,8)'></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan='12' :label='"主任"' :text='icInfo.directorName'></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan='12' :label='"副主任"' :text='icInfo.deputyDirectorName'></DetailsItem>
</a-col>
......@@ -253,12 +257,9 @@
<DetailsItem :labelSpan='12' :textSpan='12' :label='"业委会任期结束时间"' :text='icInfo.conEndDate &&
icInfo.conEndDate.slice(0,4)+ "-"+ icInfo.conEndDate.slice(4,6)+"-"+icInfo.conEndDate.slice(6,8)'></DetailsItem>
</a-col>
<a-col span="8">
<DetailsItem :labelSpan='12' :textSpan='12' :label='"主任"' :text='icInfo.directorName'></DetailsItem>
</a-col>
<!-- 自定义字段 -->
<a-col span="8" v-for="i in extList['tbl_industry_council']" :key="i.id">
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='detail[i.keyCode]'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='icInfo[i.keyCode]'></DetailsItem>
</a-col>
</a-row>
</div>
......@@ -282,7 +283,7 @@
</a-col>
<!-- 自定义字段 -->
<a-col span="8" v-for="i in extList['tbl_residents_committees']" :key="i.id">
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='detail[i.keyCode]'></DetailsItem>
<DetailsItem :labelSpan='12' :textSpan='12' :label='i.keyName+"(拓展)"' :text='rcInfo[i.keyCode]'></DetailsItem>
</a-col>
</a-row>
</div>
......@@ -369,7 +370,6 @@ export default {
},
methods: {
showModal(row) { //展开模态框
console.log(row)
this.resourceId = row.id
this.getExtKey(row)
},
......
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