Merge branch 'dev-220411' into test

src/views/modules/base/community/roomForm.vue

@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ agencyObj.neighborHoodName }}—{{agencyObj.label}}</span>
+          <span>{{ agencyObj.neighborHoodName }}{{agencyObj.buildingName}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -165,12 +165,12 @@ export default {
   },
 
   methods: {
-    async initForm (type, row, agencyObj) {
+    async initForm (type, row) {
 
       this.$refs.ref_form.resetFields();
-      this.agencyObj = agencyObj
-      this.dataForm.neighborHoodId = agencyObj.neighborHoodId
-      this.dataForm.buildingId = agencyObj.id
+      this.agencyObj = row
+      this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+      this.dataForm.buildingId = this.agencyObj.buildingId
 
       this.formType = type
       if (row) {
@@ -178,6 +178,7 @@ export default {
         this.houseId = this.dataForm.houseId
 
         this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        this.dataForm = { ...  this.dataForm }
         this.houseType = this.dataForm.houseTypeKey
         this.purpose = this.dataForm.purposeKey
         this.rentFlag = parseInt(this.dataForm.rentFlagKey)
@@ -199,7 +200,7 @@ export default {
       const url = '/gov/org/building/buildingunitlist'
 
       let params = {
-        buildingId: this.agencyObj.id
+        buildingId: this.agencyObj.buildingId
       }
 
       const { data, code, msg } = await requestPost(url, params)

src/views/modules/base/community/roomTable.vue

@@ -244,6 +244,7 @@ export default {
         this.ownerPhone = null
         this.rentFlag = null
       } else if (source === 'search') {//来源于查询
+
         this.ownerName = ownerName
         this.ownerPhone = ownerPhone
         this.rentFlag = rentFlag