非居门牌幢列表和详情

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

@@ -52,8 +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://pudong.hm.omniview.pro/api'
+  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
@@ -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'">
@@ -44,7 +44,7 @@
                   </a-menu-item>
                   <a-menu-item key="3" v-if="$route.name == 'propertyInfo'">
                   <a @click="$parent.toList(record.cspId)"> 小区列表 </a>
-                  </a-menu-item>
+                  </a-menu-item> 
                   <a-menu-item key="4" v-if="customKeyEnable == 'true'">
                     <a @click="showModal(record)"> 拓展信息维护</a>
                   </a-menu-item>

src/views/houseData/nonBuildingList.vue

+// 非居门牌幢列表
+<template>
+  <div class="routerWapper">
+    <div v-if="$route.name == 'nonBuildingList'" >
+      <div class="portalDetailContentWapper">
+        <div class="portalDetailTitle">
+          <span class="title">{{$route.query.stName}} 门牌幢</span>
+          <div class="detailOperations">
+            <a-button @click="handleReturn"> 返回 </a-button>
+          </div>
+        </div>
+      </div>
+      <div class="layoutMargin layoutPadding">
+        <a-form :form="form" class="protalForm" >
+          <a-row class="formItemLine" type="flex" align='top' :gutter="18">
+            <a-col span="8">
+              <a-form-item label="门牌地址" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+                <a-input placeholder="请输入查询内容" v-decorator="['unitAddr_l']" />
+              </a-form-item>
+            </a-col>
+            <template v-if="customKeyEnable">
+              <a-col span="8"  v-for="i in searchList" :key="i.id" >
+                <a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+                  <a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
+                    <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
+                  </a-select>
+                  <a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'"  placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
+                    <a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
+                  </a-select>
+                  <a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'"  v-decorator="[i.keyCode]"  />
+                  <a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
+                  <a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col span="24" class="algin-right">
+              <!-- <a-button  @click="exportList">导出数据</a-button> -->
+              <a-button @click="reset">重置</a-button>
+              <a-button type="primary" @click="search">搜索</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+        <!-- <p class="gayLine noline" /> -->
+        <div class="portalTableOperates">
+          <tableAndMut ref="childTab" :tableData="tableData" :pagination="pagination" :tbl="tbl" />
+        </div>
+      </div>
+    </div>
+    <RouterWapper v-else />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'nonBuildingList',
+  data() {
+    return {
+      customKeyEnable: false, // cookie里存的是否开启自定义字段
+      tbl: 'tbl_non_resident_building', // 当前表名,
+      searchList: [], // 动态渲染的搜索列表
+      keyCodeList: [], // 动态搜索的keycode列表
+      searchParams: {}, //搜索的列表
+      searchForm: {},
+      columns: [ // 表格展示的列
+        {
+          title: '门牌幢地址',
+          dataIndex: 'unitAddr',
+          key: 'unitAddr',
+          width: '40%'
+        },
+        {
+          title: '建筑类型',
+          dataIndex: 'unitBulidType',
+          key: 'unitBulidType',
+          width: '15%',
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          key: 'action',
+          width: '20%',
+          scopedSlots: {
+            customRender: 'action'
+          }
+        }
+      ],
+      pagination: { // 分页信息
+        pageNo: 1,
+        pageSize: 20,
+        total: 0,
+        current: 1,
+        defaultCurrent: 1,
+        defaultPageSize: 20,
+        showQuickJumper: true,
+        onChange: this.pageChange,
+        showSizeChanger: true,
+        showTotal: total => `总条数: ${total}`,
+        onShowSizeChange: this.showSizeChange,
+        pageSizeOptions: ['10', '20', '50', '100'],
+      },
+      tableData: [],
+    }
+  },
+  beforeCreate() { // 页面进来创建form
+    this.form = this.$form.createForm(this)
+  },
+  created () { // 进页面获取数据
+    this.customKeyEnable=this.$cookie.get('customKeyEnable')
+    if(this.customKeyEnable && this.customKeyEnable == 'true'){
+      // this.getKeys()
+      // this.getAllKeys()
+    }else {
+      this.getList()
+    }
+  },
+  mounted(){
+    if (this.$route.name == 'nonBuildingList') {
+      this.$nextTick(function () {
+        this.getSearchParams()
+      })
+    }
+  },
+  methods: {
+    handleChangeZdy(i, e){ // 自定义字段 - 搜索条件的 change
+      if (Object.prototype.toString.call(e)== '[object Array]') {
+        e2 = e.join(',')
+      } else if (Object.prototype.toString.call(e)== '[object Object]') {
+        e2 = this.$moment(e).format('YYYY-MM-DD')
+      }
+      this.form.setFieldsValue({ // 传入的i 是i.keyCode   将form表单设置成最新的值
+        i: e2
+      })
+      setTimeout(() => { // 延时器,去掉会拿不到最新的value
+        this.getList()
+      }, 0)
+    },
+    pageChange(page){ //分页切换
+      this.pagination.pageNo = page
+      this.pagination.current = page
+      this.getList()
+    },
+    showSizeChange(current, size) { //每页条数切换
+      this.pagination.pageNo = 1
+      this.pagination.current = 1
+      this.pagination.pageSize = size
+      this.getList()
+    },
+    reset(){ // 重置表单
+      this.form.resetFields()
+      this.pagination.pageNo = 1
+      this.pagination.current = 1
+      this.pagination.pageSize = 20
+      this.getList()
+    },
+    search() { // 搜索按钮
+      this.pagination.current = 1
+      this.pagination.pageNo = 1
+      //需要发送ajax
+      this.getList()
+    },
+    handleReturn(){ // 返回按钮
+      this.$router.back()
+    },
+    getList(){ // 获取数据
+      //处理动态的搜索条件,耦合到搜索列表
+      const obj = {}
+      this.keyCodeList.forEach(item => {
+        let value = !this.form.getFieldValue(item)? '':this.form.getFieldValue(item)
+        if (Object.prototype.toString.call(value)== '[object Array]') { //如果是数组
+          value = value.join(',')
+        }else if(Object.prototype.toString.call(value) === '[object Object]'){
+          value = this.$moment(value).format('YYYY-MM-DD')
+        }
+        this.$set(obj, item, value)
+      })
+
+      const searchParams = Object.assign({}, {
+        'unitAddr_l': !this.form.getFieldValue('unitAddr_l')?'':this.form.getFieldValue('unitAddr_l'),
+        // nrStId: this.$route.query.nrStId
+      }, obj)
+      this.searchParams = searchParams
+      this.$ajax.get({
+        url: this.$api.GET_NONBUILDING_LIST,
+        params: Object.assign({}, searchParams, {
+          pageSize: this.pagination.pageSize,
+          pageNo: this.pagination.current,
+        })
+      }).then(res => {
+        if (res.code === '200') {
+          /**
+           *      在请求数据的成功的时候   保存请求的各项数据及token   后面下载用
+           */
+          searchParams.token = this.$cookie.get('token')
+          let a = this.tbl + '?'
+          for(const k in searchParams){
+            a = a+k+'='+ searchParams[k]+ '&'
+          }
+          this.exportParams = a
+          this.pagination.total= this.$com.confirm(res, 'data.totalRows', 0)
+          this.tableData = this.$com.confirm(res, 'data.content', [])
+          this.tableData.forEach(col => {
+            if (col.unitBulidType == 1) {
+              col.unitBulidType = '低层'
+            } else if (col.unitBulidType == 2){
+              col.unitBulidType = '多层'
+            } else if (col.unitBulidType == 3){
+              col.unitBulidType = '高层'
+            } else if (col.unitBulidType == 4){
+              col.unitBulidType = '超高层'
+            } 
+            if (col.unitArchstruct == '01') {
+              col.unitArchstruct = '含钢结构'
+            } else if (col.unitArchstruct == '02'){
+              col.unitArchstruct = '钢混结构'
+            } else if (col.unitArchstruct == '03'){
+              col.unitArchstruct = '砖混结构'
+            } else if (col.unitArchstruct == '04'){
+              col.unitArchstruct = '砖木结构'
+            } else if (col.unitArchstruct == '05'){
+              col.unitArchstruct = '木结构'
+            } else if (col.unitArchstruct == '06'){
+              col.unitArchstruct = '钢结构'
+            } else if (col.unitArchstruct == '09'){
+              col.unitArchstruct = '其他'
+            }   
+            if (col.unitFacadeType == 1) {
+              col.unitFacadeType = '玻璃幕墙'
+            } else if (col.unitFacadeType == 2){
+              col.unitFacadeType = '外墙保温材料'
+            } else if (col.unitFacadeType == 9){
+              col.unitFacadeType = '其他'
+            }  
+            if (col.unitCnstAreaType == 1) {
+              col.unitCnstAreaType = '实测面积'
+            } else if (col.unitCnstAreaType == 2){
+              col.unitCnstAreaType = '预估面积'
+            }
+            if (col.unitUngType == '01') {
+              col.unitUngType = '商城'
+            } else if (col.unitUngType == '02'){
+              col.unitUngType = '车库'
+            } else if (col.unitUngType == '09'){
+              col.unitUngType = '其他'
+            }
+            if (col.unitExternalWallFlag == 0) {
+              col.unitExternalWallFlag = '无'
+            } else if (col.unitExternalWallFlag == 1){
+              col.unitExternalWallFlag = '有'
+            }
+            if (col.unitFlag == false) {
+              col.unitFlag = '无'
+            } else {
+              col.unitFlag = '有'
+            }
+          })
+        }
+        //
+        // 存储当前页面列表的搜索信息
+        //
+        this.$com.storeSearchParams(
+          this.$route.name,
+          this.pagination,
+          searchParams
+        )
+      })
+    },
+    /**
+     * 从vuex中或已存储的搜索条件，判断此条件是否为当前路由的 。如果是则使用
+     */
+    getSearchParams(){
+      const searchParams = !this.$store.state.listSearchParams?null:this.$store.state.listSearchParams[this.$route.name]
+      if(!!searchParams && !!searchParams.routeName && (this.$route.name == searchParams.routeName)){
+        if(!!searchParams.params){
+          Object.keys(searchParams.params).forEach(elem => {
+            switch (elem) {
+            case 'unitAddr_l':
+              this.form.setFieldsValue({ 'unitAddr_l': searchParams.params[elem] })
+              break
+            default:
+              break
+            }
+          })
+        }
+        if(!!searchParams.pagination){
+          if(!!searchParams.pagination.pageNo){
+            this.pagination.pageNo = searchParams.pagination.pageNo
+            this.pagination.current = searchParams.pagination.current
+            this.pagination.pageSize = searchParams.pagination.pageSize
+          }
+        }
+      }
+      this.getList()
+    },
+    toView(params){ // 操作里面去详情
+      this.$router.push({path: `/houseData/nonBuildingList/nonBuildingInfo/${params.id}`})
+    },
+    exportList(){ //导出功能
+      const formValue = this.form.getFieldsValue()
+      let newUrl = this.tbl + '?'
+      let newObj = {}
+      //拼接除 c.xxx 之外的数据
+      for(const k in formValue){
+        if (formValue[k]!= undefined ) { // 判断是否值为 undefined
+          if ( k == 'c') { // 排除 c.xxx 的键
+            newObj = formValue[k] //有c.xx存入 b对象  下面处理,
+          } else if(Object.prototype.toString.call(formValue[k])== '[object Array]'){
+            // 数组的话就拼接字符串
+            newUrl += k +'=' + formValue[k].join(',') + '&'
+          }else if (Object.prototype.toString.call(formValue[k]) === '[object Object]') {
+            //时间格式对象就转换成字符串
+            newUrl += k +'=' +this.$moment(formValue[k]).format('YYYY-MM-DD') +'&'
+          }else {
+            newUrl += k +'=' +formValue[k] +'&' //没有特殊情况  直接拼接到 newUrl
+          }
+        }
+      }
+      // 处理 c.xxx 里面的数据
+      for(const k in newObj ){
+        if (newObj[k] != undefined) { // 排除值为undefined的键
+          newUrl += 'c.'+ k +'=' +newObj[k].split('#')[1] +'&' // 拼接到 newUrl
+        }
+      }
+      const token = this.$cookie.get('token') // 获取token 并拼接到 newUrl
+      newUrl += '&token=' + token
+      window.open (this.$api.BASE_URL+'/service-basicdatasync-ddd/export/'+ newUrl)
+    },
+  },
+}
+</script>
+
+<style>
+.routerWapper[data-v-5f2c575d] .ant-table-small>.ant-table-content>.ant-table-body {
+  margin: 0;
+}
+</style>

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>

src/views/houseData/propertyInfoView.vue

@@ -21,6 +21,7 @@
               <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>
+              <p v-if="urls.name == 'nonBuildingInfo'" class="detailsPartTitle">非居门牌幢信息</p>
               <div style="margin:0 16px;">
                   <!-- 物业 -->
                 <div v-if="urls.name == 'propertyInfoView' ">
@@ -399,6 +400,150 @@
                       </a-col>
                     </a-row>
                   </a-col>
+                </a-row>
+                    <!-- 非居门牌幢信息 -->
+                <a-row v-if="urls.name == 'nonBuildingInfo'" 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.unitAddr'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"路"' :text='detail.unitLoad'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"弄"' :text='detail.unitLong'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"支弄"' :text='detail.unitSublong'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"号"' :text='detail.unitNo'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"幢号"' :text='detail.buildNo'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑类型"' :text='detail.unitBulidType'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"总层数"' :text='detail.unitTotFloor'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"电梯标志"' :text='detail.unitFlag'/>
+                      </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.unitTotElevator'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"房屋结构"' :text='detail.unitArchstruct'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"竣工日期"' :text='detail.unitFinishDate'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑面积"' :text='detail.unitCnstArea'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"建筑面积类型"' :text='detail.unitCnstAreaType'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"占地面积"' :text='detail.unitArea'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"地下建筑面积"' :text='detail.unitUndgrndArea'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"地下建筑类型"' :text='detail.unitUngType'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"地下建筑层数"' :text='detail.unitUngFloor'/>
+                      </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.unitTotFireEngineAccess'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"生活水泵数"' :text='detail.unitTotPumps'/>
+                      </a-col>
+                    </a-row>
+                      <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"水箱数"' :text='detail.unitTotTanks'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"消防栓数"' :text='detail.unitTotFireHydrants'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"有无外墙附属设施"' :text='detail.unitExternalWallFlag'/>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"外墙附属设施信息"' :text='detail.unitExternalWallInfo'/>
+                      </a-col>
+                    </a-row>
+                      <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"外立面类型"' :text='detail.unitFacadeType'/>
+                      </a-col>
+                    </a-row>
+                      <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"管理单位名称"' :text='detail.unitMusName'/>
+                      </a-col>
+                    </a-row>
+                      <a-row type="flex" justify="start" class="detailsPartLine">
+                      <a-col span="24">
+                        <DetailsItem :labelSpan='12' :textSpan="12" :label='"管理单位联系方式"' :text='detail.unitMusLinknum'/>
+                      </a-col>
+                    </a-row> 
+                  </a-col>
                 </a-row>
                     <!-- 业委会 -->
                 <a-row v-if="urls.name == 'indCouView'" type="flex" justify="start">
@@ -742,6 +887,78 @@ export default {
             data[i] = data[i].toString()
           }
         }
+        // 非居门牌幢详情
+        if(this.$route.name == 'nonBuildingInfo'){
+          for (const text in data) {
+            if(text == 'unitBulidType'){
+              if (data[text] == '1') {
+                data[text] = '低层'
+              } else if (data[text] == '2'){
+                data[text] = '多层'
+              } else if (data[text] == '3'){
+                data[text] = '高层'
+              } else if (data[text] == '4'){
+                data[text] = '超高层'
+              } 
+            }
+            if(text == 'unitArchstruct'){
+              if (data[text] == '01') {
+                data[text] = '含钢结构'
+              } else if (data[text] == '02'){
+                data[text] = '钢混结构'
+              } else if (data[text] == '03'){
+                data[text] = '砖混结构'
+              } else if (data[text] == '04'){
+                data[text] = '砖木结构'
+              } else if (data[text] == '05'){
+                data[text] = '木结构'
+              } else if (data[text] == '06'){
+                data[text] = '钢结构'
+              } else if (data[text] == '09'){
+                data[text] = '其他'
+              } 
+            }
+            if(text == 'unitFacadeType'){
+              if (data[text] == '1') {
+                data[text] = '玻璃幕墙'
+              } else if (data[text] == '2'){
+                data[text] = '外墙保温材料'
+              } else if (data[text] == '9'){
+                data[text] = '其他'
+              } 
+            }
+            if(text == 'unitCnstAreaType'){
+              if (data[text] == '1') {
+                data[text] = '实测面积'
+              } else if (data[text] == '2'){
+                data[text] = '预估面积'
+              }
+            }
+            if(text == 'unitUngType'){
+              if (data[text] == '01') {
+                data[text] = '商城'
+              } else if (data[text] == '02'){
+                data[text] = '车库'
+              } else if (data[text] == '09'){
+                data[text] = '其他'
+              }
+            }
+            if(text == 'unitExternalWallFlag'){
+              if (data[text] == 0) {
+                data[text] = '无'
+              } else if (data[text] == 1){
+                data[text] = '有'
+              }
+            }
+            if(text == 'unitFlag'){
+              if (data[text] == '0') {
+                data[text] = '无'
+              } else if (data[text] == '1'){
+                data[text] = '有'
+              }
+            }
+          }
+        }
         // 物业原资质
         if(this.$route.name == 'propertyInfoView'){
           this.getStList()
@@ -906,6 +1123,10 @@ export default {
         this.newUrl = this.$api.GET_NEI_ID.replace('{id}', this.$route.params.id)
         this.tbl = 'tbl_residents_committees'
         break
+      case 'nonBuildingInfo':
+        this.newUrl = this.$api.GET_NONBUILDING_ID.replace('{id}', this.$route.params.id)
+        this.tbl = 'tbl_non_resident_building'
+        break
       default:
         break
       }
@@ -922,7 +1143,7 @@ export default {
         if (res.code == 200) {
           //先获取全部的自定义字段列表 
           this.extList = this.$com.confirm(res, 'data.content', [])
-          console.log(this.extList)
+          // console.log(this.extList)
           this.getList()
         }
       })