diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 57bc9b7c..d822217a 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -9,10 +9,10 @@
-
+
-
@@ -78,7 +78,7 @@
-
+
@@ -153,16 +153,19 @@
-
+
-
+
-
+
@@ -171,7 +174,8 @@
-
+
@@ -204,16 +208,24 @@ export default {
},
computed: {
...mapState(['user']),
+ isEdit(){
+ return !!this.$route.query.id
+ },
addTitle() {
- return !!this.$route.query.id ? "编辑监测对象" : "添加监测对象"
+ return this.isEdit? "编辑监测对象" : "添加监测对象"
},
rules() {
return {
idNumber: [{required: true, message: "请输入身份证号"}],
name: [{required: true, message: "请输入姓名"}],
sex: [{required: true, message: "请选择性别"}],
- currentAreaId: [{required: true, message: "请选择户籍地"}],
+ currentAreaId: [
+ {required: true, message: "请选择户籍地"},
+ {pattern: /[^0]0{0,2}$/, message: "请选择到村/街道"},
+ ],
isHousehold: [{required: true, message: "请选择是否户主"}],
+ householdRelation: [{required: true, message: "请选择与户主关系"}],
+ householdIdNumber: [{required: true, message: "请选择户主身份证号"}],
}
},
rootArea() {
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 7bf5e26b..d68869bc 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -209,7 +209,7 @@
- 仅支持10M以内的jpg、jpeg、png格式照片
+ 最多9张,仅支持10M以内的jpg、jpeg、png格式照片
@@ -340,6 +340,7 @@ export default {
this.instance.post(`/app/apppreventionreturntopovertylog/addOrUpdate`, {...this.form, pid}).then(res => {
if (res.code == 0) {
this.$message.success('提交成功!');
+ this.dialog = false
this.getHelpLogs()
}
})
@@ -357,7 +358,7 @@ export default {
}).then(res => {
if (res?.code == 0) {
this.$message.success("删除成功!")
- this.back()
+ this.getHelpLogs()
}
})
}).catch(() => 0)
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 593a5181..fd3a10a0 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -10,7 +10,7 @@
-