楼栋单元过滤

operationSupport/src/components/common/buildingTree.vue

@@ -69,12 +69,11 @@ export default {
     methods: {
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }

operationSupport/src/components/common/organTree.vue

@@ -55,12 +55,11 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }

operationSupport/src/components/common/treeHouse.vue

@@ -275,11 +275,12 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });

operationSupport/src/views/deviceManagement/popups/poptreeSelect.vue

@@ -29,7 +29,7 @@ export default {
     mounted() {},
     methods: {
         submit() {
-                        debugger;
+            debugger;
             if (this.unitPa.type === 'room') {
                 this.params.callback && this.params.callback(this.unitPa);
                 this.$emit('close');
@@ -53,11 +53,12 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });

operationSupport/src/views/ownerManagement/stepPage/add.vue

@@ -664,11 +664,12 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                if (!!item.children & (item.type !== 'unit')) {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.name.indexOf('单元') === -1 && item.type === 'unit') {
-                        item.name = item.name + '单元';
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }
             });

operationSupport/src/views/ownerManagement/stepPage/newAdd.vue

@@ -156,7 +156,7 @@
 
                         <div class="block-title car" v-for="(items, indexs) in item.parkingList" :key="indexs">
                             <div class="floor list-title">
-                                {{ `${items.garageName}${items.areaName || items.partitionName}-${items.parkingNumber}` }}
+                                {{ `${items.garageName}${items.areaName || items.partitionName || ''}-${items.parkingNumber}` }}
                             </div>
                             <span class="remove list-title" @click="removeCard(indexs, item)">移除</span>
                             <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
@@ -626,12 +626,11 @@ export default {
         },
         dimension(arr) {
             arr.map((item, index) => {
-                 if (!!item.children && item.type !== 'unit' && item.type !== 'building') {
+                if (!!item.children) {
                     this.dimension(item.children);
-                } else {
-                    if (item.type === 'unit') {
+                    if (item.type == 'unit') {
                         item.name = this.CheckChinese(item.name, '单元');
-                    } else if (item.type === 'building') {
+                    } else if (item.type == 'building') {
                         item.name = this.CheckChinese(item.name, '楼栋');
                     }
                 }