diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue index f79bb2fe..d52f2d2a 100644 --- a/packages/jianping/AppHelpedResident/hrAdd.vue +++ b/packages/jianping/AppHelpedResident/hrAdd.vue @@ -22,9 +22,9 @@ - + + v-model="form.birthDate" type="date" placeholder="选择日期"/> @@ -252,8 +252,8 @@ export default { }) }, handleIdNumberAutocomplete(v) { - let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v) - this.form = {...this.form, birthday, sex, age: this.$calcAge(v)} + let {birthday:birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v) + this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)} }, submit() { this.$refs.ruleForm.validate(v => { diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index 60f0dca5..8c94ce68 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -36,7 +36,7 @@
{{ 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()"/> -