{{ detail.idNumber }}
{{ dict.getLabel('sex', detail.sex) }}
-
{{ detail.birthday }}
+
{{ detail.birthDate }}
{{ detail.age }}
{{ dict.getLabel('fpEducation', detail.education) }}
{{ dict.getLabel('fpNation', detail.nation) }}
@@ -311,8 +311,8 @@ export default {
}).catch(() => 0)
},
handleRelieve(pass) {
- let {id} = this.detail
- this.$confirm(`是否${!pass ? '(申请)' : ''}解除监测对象`).then(() => {
+ let {id} = this.detail, msg = pass == 0 ? `是否继续监测对象` : `是否${isNaN(pass) ? '(申请)' : ''}解除监测对象`
+ this.$confirm(msg).then(() => {
this.instance.post("/app/apppreventionreturntopoverty/relieve", null, {
params: {pass, id}
}).then(res => {
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index fd3a10a0..d82a3cb5 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -63,7 +63,7 @@
url="/app/apppreventionreturntopoverty/downloadTemplate"
importUrl="/app/apppreventionreturntopoverty/import"
@onSuccess="page.current=1,search={},getTableData()"/>
-