diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
index 7d92656a8..a13585a82 100644
--- a/src/views/components/resiChangeRecord.vue
+++ b/src/views/components/resiChangeRecord.vue
@@ -20,38 +20,46 @@
label="变更类型"
width="80">
-
-
-
+ label="原因"
+ show-overflow-tooltip
+ min-width="120">
-
-
+ width="230">
+
+
+
+
+
-
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 89424a120..6754fd0d0 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -500,7 +500,7 @@ export default {
message: `请联系${data.resiAgencyName}迁出该居民后操作`
})
this.btnDisable = true
- }
+ } else this.btnDisable = false
this.userInfo = { ...data }
} else {
this.$message.error(msg)
@@ -771,13 +771,13 @@ export default {
},
async handleComfirm() {
- this.btnDisable = true
+
// setTimeout(() => {
// this.btnDisable = false
// }, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
- app.util.validateRule(messageObj)
+ // app.util.validateRule(messageObj)
this.btnDisable = false
} else {
if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
@@ -786,6 +786,7 @@ export default {
message: '手机号格式有误'
})
}
+ this.btnDisable = true
if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
const { user } = this.$store.state
if (user.agencyId == this.userInfo.resiAgencyId) {
@@ -804,8 +805,8 @@ export default {
return
}
}
-
- } else this.submit()
+ }
+ this.submit()
}
})
@@ -846,6 +847,7 @@ export default {
this.orgId = ''
this.nowAllCode = []
this.btnDisable = false
+ this.userInfo = {}
this.fmData = iniFmData()
}
}
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 06faa43f2..283abe28f 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -347,9 +347,10 @@
>
-
+