Merge branch 'dev' into xuhui

src/router/routes.js

@@ -131,6 +131,16 @@ const appRoutes = [
               },
             ]
           },
+          {//居委会列表
+            path: '/houseData/neighborhoodCommittees', name: 'neighborhoodCommittees', component: resolve => require(['@/views/houseData/neighborhoodCommittees'], resolve), //neighborhoodCommittees,
+            meta: { title: '居委会信息列表', menuPath: true, hideInBread: false, },
+            children: [
+              {
+                path: '/houseData/neighborhoodCommittees/:id', name: 'neighborhoodCommitteesView', component: resolve => require(['@/views/houseData/propertyInfoView'], resolve), //PropertyInfoView,
+                meta: { title: '居委会详细情况', menuPath: false, hideInBread: false, },
+              },
+            ]
+          },
         ]
       },
       {
@@ -149,6 +159,7 @@ const appRoutes = [
           },
         ]
       },
+      
     ],
   },
   {

src/server/api.js

@@ -52,7 +52,8 @@ case 'huangpu-prod':
 
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2' 
-  BASE_URL = 'http://211.136.105.193/apiv2'
+  // BASE_URL = 'http://211.136.105.193/apiv2'
+  BASE_URL = 'http://pudong.hm.omniview.pro/api'
  
   // MOCK_URL = 'https://yapi.omniview.pro/mock/278'
   break
@@ -143,6 +144,11 @@ export default {
   // 首页统计列表
   POST_LOGIN: '/service-user/public/login',
 
+  // 居委会列表
+  GET_NEI_LIST: '/service-basicdatasync-ddd/residentsCommittees',
+  // 居委会详情
+  GET_NEI_ID: '/service-basicdatasync-ddd/residentsCommittees/{id}',
+
   /**
    * SSO
    */

src/views/houseData/propertyInfoView.vue

 <template>
 <div class="routerWapper">
-    <div v-if="urls.name == 'memberView' ||'cmDivisionView' || 'propertyInfoView' || 'indCouView' || 'nonResidentsView' || 'managerView' || 'buildingView'" class="portalDetailWapper">
+    <div v-if="urls.name == 'memberView' ||'cmDivisionView' || 'propertyInfoView' || 'indCouView' || 'nonResidentsView' || 'managerView' || 'buildingView'||'neighborhoodCommitteesView'" class="portalDetailWapper">
       <div class="portalDetailContentWapper">
           <div class="portalDetailTitle">
             <span class="title">详情</span>
@@ -20,6 +20,7 @@
               <p v-if="urls.name == 'managerView'" class="detailsPartTitle">小区经理信息</p>
               <p v-if="urls.name == 'buildingView'" class="detailsPartTitle">小区楼栋信息</p>
               <p v-if="urls.name == 'memberView'" class="detailsPartTitle">成员信息</p>
+              <p v-if="urls.name == 'neighborhoodCommitteesView'" class="detailsPartTitle">业委会信息</p>
               <div style="margin:0 16px;">
                   <!-- 物业 -->
                 <div v-if="urls.name == 'propertyInfoView' ">
@@ -591,6 +592,35 @@
                       </a-col>
                     </a-row>
                   </a-col>
+                </a-row>
+                    <!-- 居委会 -->
+                <a-row v-if="urls.name == 'neighborhoodCommitteesView'" type="flex" justify="start">
+                  <a-col span="8">
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会名称"' :text='detail.cmtName'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"居委会地址"' :text='detail.cmtAddr'/>
+                      </a-col>
+                    </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='detail.cmtDirectorName'/>
+                      </a-col>
+                    </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='detail.cmtSecretaryName'/>
+                      </a-col>
+                    </a-row>
+                  </a-col>
                 </a-row>
               </div>
             </div>
@@ -872,6 +902,10 @@ export default {
         this.newUrl = this.$api.GET_MEMBER_ID.replace('{id}', this.$route.params.id)
         this.tbl = 'tbl_ic_member'
         break
+      case 'neighborhoodCommitteesView':
+        this.newUrl = this.$api.GET_NEI_ID.replace('{id}', this.$route.params.id)
+        this.tbl = 'tbl_ic_member'
+        break
       default:
         break
       }
@@ -885,6 +919,7 @@ export default {
         if (res.code == 200) {
           //先获取全部的自定义字段列表 
           this.extList = this.$com.confirm(res, 'data.content', [])
+          console.log(this.extList)
           this.getList()
         }
       })