From b5fa8a7cc176623de9e3932c50b2b0be0a28297c Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 8 Aug 2022 10:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue  | 10 +++++++---
 src/views/modules/base/roomForm.vue |  3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 4ea60259e..35dfb3b42 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -210,7 +210,7 @@
         >
         <template slot-scope="scope">
           <el-image 
-            style="max-height: 50px"
+            style="max-height: 50px; max-width: 50px;"
             :src="scope.row.faceImg" 
             :preview-src-list="[scope.row.faceImg]">
             <div slot="error" class="image-slot">
@@ -417,7 +417,7 @@
                @closed="addHouseShow = false">
       <room-form ref="ref_form"
                  @dialogCancle="addHouseShow = false"
-                 @dialogOk="checkHandle('2')"></room-form>
+                 @dialogOk="roomFormOk"></room-form>
     </el-dialog>
   </div>
 </template>
@@ -731,7 +731,6 @@ export default {
     },
     // 审核提交方法
     checkHandle (type) {
-      console.log('xxxxx', this.dataForm)
       const params = {
         id: this.dataForm.id,
         checkState: type, // 0-未审核 1-未通过 2-已通过
@@ -789,6 +788,11 @@ export default {
         })
       }).catch(() => {})
     },
+    roomFormOk (e) {
+      this.dataForm.buildingUnitId = e.buildingUnitId
+      this.dataForm.doorName = e.doorName
+      this.checkHandle('2')
+    }
   },
 };
 </script>
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index f47c52658..704fad4ff 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -327,9 +327,8 @@ export default {
           type: 'success',
           message: '操作成功'
         })
+        this.$emit('dialogOk', { doorName: this.dataForm.doorName, buildingUnitId: this.dataForm.buildingUnitId })
         this.resetData()
-        this.$emit('dialogOk')
-
       } else {
 
         this.$message.error(msg)