Merge remote-tracking branch 'origin/master'

lin

2024-03-18 bcd69d38e256129077d6dfc71f2b1781bcce71e4

Merge remote-tracking branch 'origin/master'

 subPackage/house/houseNumber/index.vue

@@ -188,7 +188,11 @@
                        name: 'frontType',

                        value: '未完善'

                    },



                    {

                        title: '三级消防单位',

                        name: 'threeFireProtection',

                        value: '未完善'

                    },

                    {

                        title: '场所负责人',

                        name: 'principal',

@@ -476,6 +480,10 @@
                            item.value = data.isFront == 1 ? "是" : "否"



                        }

                        if (item.name == 'threeFireProtection') {

                            item.value = data.threeFireProtection == 1 ? "是" : "否"

						
                        }

                        if (data.isFront == 1 && item.name == "frontType") {

                            this.getBizDict('frontType', (list) => {

                                item.value = this.$getIndex(list, data.frontType, 'dictKey',


 subPackage/house/roomControl/myHouse.vue

@@ -333,6 +333,8 @@
                        urls.push(e.name)
                    })
                    this.form.imageUrls = urls.join(",")
                }else{
                    this.form.imageUrls = '';
                }

                if (this.form.propertyCertificateImg.length) {
@@ -341,6 +343,8 @@
                        urls.push(e.name)
                    })
                    this.form.propertyCertificateImg = urls.join(",")
                }else{
                    this.form.propertyCertificateImg = '';
                }