Merge branch 'dev' into xuhui

src/router/routes.js

@@ -155,6 +155,16 @@ const appRoutes = [
                 path: '/houseData/nonResident/:id', name: 'nonResidentsView', component: resolve => require(['@/views/houseData/propertyInfoView'], resolve), //PropertyInfoView,
                 meta: { title: '非居详细情况', menuPath: false, hideInBread: false, }
               },
+              {
+                path: '/houseData/nonBuildingList', name: 'nonBuildingList', component: resolve => require(['@/views/houseData/nonBuildingList'], resolve), //PropertyInfoView,
+                meta: { title: '非居门牌幢列表', menuPath: false, hideInBread: false, },
+                children: [
+                  {
+                    path: '/houseData/nonBuildingList/nonBuildingInfo/:id', name: 'nonBuildingInfo', component: resolve => require(['@/views/houseData/propertyInfoView'], resolve), //PropertyInfoView,
+                    meta: { title: '非居门牌幢详情', menuPath: false, hideInBread: false, }
+                  }
+                ]
+              },
             ]
           },
         ]

src/server/api.js

@@ -127,6 +127,10 @@ export default {
   GET_NONRESIDENTS_LIST: '/service-basicdatasync-ddd/nonResidents',
   // 非居详情
   GET_NONRESIDENT_ID: '/service-basicdatasync-ddd/nonResident/{id}',
+  // 非居门牌幢列表
+  GET_NONBUILDING_LIST: '/service-basicdatasync-ddd/nonResi/buildings', // /service-basicdatasync-ddd/nonResi/buildings
+  // 非居门牌幢详情
+  GET_NONBUILDING_ID: '/service-basicdatasync-ddd/nonResi/building/{id}', // /service-basicdatasync-ddd/nonResi/building/{id}
   // 小区楼栋列表
   GET_BUILDINGS_LIST: '/service-basicdatasync-ddd/community/buildings',
   // 小去楼栋详情

src/views/components/tableAndMut.vue

@@ -33,7 +33,7 @@
             <a-dropdown :trigger="['click']" v-if="customKeyEnable == 'true' || $route.name=='basicInfo' || $route.name=='propertyInfo' || $route.name=='indCous'">
                 <a class="ant-dropdown-link" href="#">| 更多 <a-icon type="down" /></a>
                 <a-menu slot="overlay">
-                  <a-menu-item key="0" v-if="$route.name == 'basicInfo'">
+                  <a-menu-item key="0" v-if="$route.name == 'basicInfo' || $route.name == 'nonResidents'">
                   <a  @click="$parent.toBul(record)"> 门牌幢 </a>
                   </a-menu-item>
                   <!-- <a-menu-item key="1" v-if="$route.name == 'basicInfo'">

src/views/houseData/nonResidents.vue

@@ -330,6 +330,9 @@ export default {
       newUrl += '&token=' + token
       window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
     },
+    toBul(record){ //到非居门牌幢列表
+      this.$router.push({path: '/houseData/nonBuildingList', query: { nrStId: record.id, stName: record.stName }})
+    },
   },
 }
 </script>