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 @@ > @@ -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') + } }, }; 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)