diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue index 55830b1c..e05e4997 100644 --- a/src/views/modules/base/huji/immigration/edit.vue +++ b/src/views/modules/base/huji/immigration/edit.vue @@ -767,30 +767,33 @@ export default { message: '手机号格式有误' }) } - this.submit() + if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) { + const { user } = this.$store.state + if (user.agencyId == this.userInfo.resiAgencyId) { + if (this.userInfo.resiHomeId !== this.fmData.homeId) { + this.$confirm('居民信息中房屋信息与当前选择房屋不一致,是否更新?', '提示', { + confirmButtonText: '更新', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.fmData.isReplace = '1' + this.submit() + }).catch(() => { + this.fmData.isReplace = '0' + this.submit() + }); + return + } + } + + } else this.submit() + } }) }, async submit() { - if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) { - const { user } = this.$store.state - if (user.agencyId == this.userInfo.resiAgencyId) { - if (this.userInfo.resiHomeId !== this.fmData.homeId) { - this.$confirm('居民信息中房屋信息与当前选择房屋不一致,是否更新?', '提示', { - confirmButtonText: '更新', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.fmData.isReplace = '1' - }).catch(() => { - this.fmData.isReplace = '0' - }); - return - } - } - - } + let url = '' if (this.formType === 'add') { url = '/epmetuser/icMoveIn/add'