1小区列表条件新增 物业合同到期日 2小区详情拓展字段增加各项目的拓展字段,

src/views/houseData/basicInfo.vue

@@ -48,6 +48,11 @@
               </a-select>
             </a-form-item>
           </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-form-item>
+          </a-col>
           <a-col span="8">
             <a-form-item v-if="!simpleSearchForm" label="小区性质" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-select
@@ -528,6 +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') : ''
       }, obj, isHocId)// 融合obj 和isHocId 到入参
 
       searchParams[this.personalizedKey] = !this.formed?'': this.formed

src/views/houseData/basicView.vue

@@ -8,6 +8,7 @@
 			    <div class="detailOperations">
 				  <a-button @click="$router.push({path: `/houseData/buildings`,query:{id:$route.query.id,name:$route.query.name}})"> 门牌幢 </a-button>
 				  <a-button @click="$router.push({path: `/houseData/shebei/${$route.query.id}`})"> 设施设备 </a-button>
+				  <a-button @click="$router.push({path: `/houseData/shebei/${$route.query.id}`})"> 设施设备(勘验) </a-button>
 				  <a-button @click="handleReturn"> 返回 </a-button>
 			  </div>
 		   </div>
@@ -133,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='detail[i.keyCode]'></DetailsItem>
                   </a-col>
                 </a-row>
               </div>
@@ -168,7 +169,7 @@
                   </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='detail[i.keyCode]'></DetailsItem>
                   </a-col>
                 </a-row>
               </div>
@@ -201,7 +202,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='detail[i.keyCode]'></DetailsItem>
                   </a-col>
                 </a-row>
               </div>
@@ -257,14 +258,14 @@
                   </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='detail[i.keyCode]'></DetailsItem>
                   </a-col>
                 </a-row>
               </div>
             </div>
-
+                <!-- 居委会信息 -->
             <div class="layoutMargin detailsPartSection">
-              <p id="cmtInfo" class="detailsPartTitle">居委会信息</p>
+              <p id="jwhInfo" class="detailsPartTitle">居委会信息</p>
               <div style="margin:0 16px;">
                 <a-row type="flex" justify="start">
                   <a-col span="8">
@@ -281,7 +282,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='detail[i.keyCode]'></DetailsItem>
                   </a-col>
                 </a-row>
               </div>
@@ -315,7 +316,7 @@
             <a-anchor-link href="#train" title="物业企业信息" />
             <a-anchor-link href="#cmInfo" title="小区经理信息" />
             <a-anchor-link href="#ertificate" title="业主大会信息" />
-            <a-anchor-link href="#cmtInfo" title="居委会信息" />
+            <a-anchor-link href="#jwhInfo" title="居委会信息" />
             <a-anchor-link v-if="customKeyEnable == 'true' && extList.length>0" href="#extList" title="拓展信息" />
           </a-anchor>
         </div>
@@ -353,14 +354,13 @@ export default {
     this.customKeyEnable=this.$cookie.get('customKeyEnable')
     if(this.customKeyEnable && this.customKeyEnable == 'true'){
       this.getExt('tbl_community')
-      this.getExt(' tbl_community_amst_office')
+      this.getExt('tbl_community_amst_office')
       this.getExt('tbl_prop_company')
       this.getExt('tbl_community_manager')
       this.getExt('tbl_industry_council')
       this.getExt('tbl_residents_committees')
-    }else {
-      this.getList()
     }
+    this.getList()
   },
   methods: {
     handleReturn() {
@@ -452,8 +452,7 @@ export default {
         if (res.code == 200) {
           //先获取全部的自定义字段列表 
           this.extList[tblName] = this.$com.confirm(res, 'data.content', [])
-          console.log(this.extList)
-          this.getList()
+          // console.log(this.extList)
         }
       })
     }