merge

Lou

2023-11-11 03eaa258e9f6ae5aceb9e26989cd1025d35de147

 subPackage/workbench/views/cscj.vue

@@ -265,7 +265,7 @@
                  },

                  {

                     label: "采集人",

                     name: 'createUser',

                     name: 'createUserName',

                     value: "未完善"

                  },

                  {

@@ -367,7 +367,8 @@
      onLoad(option) {

         const {

            houseCode,

            id

            id,

            type

         } = option

         this.houseCode = houseCode

         this.currentId = id

@@ -375,7 +376,11 @@
            this.getBuildingDetail()

         }





         if (!!type || type != void 0) {

            uni.setNavigationBarTitle({

               title: '详情'

            })

         }

      },

      onShow() {

         this.getLabel()

@@ -453,11 +458,11 @@
                     icon: 'error'

                  })

                  return

               }
               const dpaEntity = data?.doorplateAddressEntity || {}
					
               this.form.buildingCode = dpaEntity?.buildingCode || ''
					
               }

               const dpaEntity = data?.doorplateAddressEntity || {}



               this.form.buildingCode = dpaEntity?.buildingCode || ''



               let buildingNameArr = [

                  dpaEntity?.townStreetName,

                  dpaEntity?.neiName,

@@ -468,17 +473,17 @@
               let arr = buildingNameArr.filter(e => {

                  return e != null || e != ''

               })

               this.form.placeName = data['placeName'] || ''
					
               Object.keys(this.form).forEach(key => {
                  if (!data[key]) {
                     this.form[key] = dpaEntity[key] || '未完善'
                  } else {
                     this.form[key] = data[key] || '未完善'
                  }
                  if (key === "images") {
                     this.form[key] = []
                  }
               this.form.placeName = data['placeName'] || ''



               Object.keys(this.form).forEach(key => {

                  if (!data[key]) {

                     this.form[key] = dpaEntity[key] || '未完善'

                  } else {

                     this.form[key] = data[key] || '未完善'

                  }

                  if (key === "images") {

                     this.form[key] = []

                  }

               })



               this.form.building = arr.join("")

@@ -488,20 +493,21 @@
                     if (!data[item.name]) {

                        item.value = dpaEntity[item.name] || '未完善'

                     } else {

                        item.value = data[item.name]|| '未完善'

                        item.value = data[item.name] || '未完善'

                     }

                  })

                  this.publicData[key].forEach(item => {

                     if (!data[item.name]) {

                        item.value = dpaEntity[item.name] || '未完善'

                     } else {

                        item.value = data[item.name]|| '未完善'

                        item.value = data[item.name] || '未完善'

                     }

                  })

               })



               data.placePoiLabelVOList.forEach(item => {

                  let label = this.labelList[0].children.find(sl => sl.text === item.labelName) || {}

                  console.log(label);

                  label['isClose'] = false

                  this.showLabelList.push(label)

               })

@@ -544,16 +550,16 @@
            const townStreet = await this.getDoorplateAddressList(null, "townStreet")

            this.setColumn(townStreet, 0)

            //设置社区

            const nei = await this.getDoorplateAddressList(townStreet[0].code, "nei")

            const nei = await this.getDoorplateAddressList(townStreet[0]?.code, "nei")

            this.setColumn(nei, 1)

            //设置路

            const streetRu = await this.getDoorplateAddressList(nei[0].code, "streetRu")

            const streetRu = await this.getDoorplateAddressList(nei[0]?.code, "streetRu")

            this.setColumn(streetRu, 2)

            //设置地区

            const district = await this.getDoorplateAddressList(streetRu[0].code, "district")

            const district = await this.getDoorplateAddressList(streetRu[0]?.code, "district")

            this.setColumn(district, 3)

            //设置楼栋

            const building = await this.getDoorplateAddressList(district[0].code, "building")

            const building = await this.getDoorplateAddressList(district[0]?.code, "building")

            this.setColumn(building, 4)

         },