diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index 763ad21f..93573015 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -185,7 +185,7 @@ export default { moEndTime: "", afStartTime: "", afEndTime: "", - noAvailableVaccines: "1", + noAvailableVaccines: '1', mobile: "", address: "", longitude: "120.38945519", @@ -216,7 +216,7 @@ export default { ], inoculationDate: [ { - required: true, + required: this.dataForm.noAvailableVaccines === '2', message: this.$t("validate.required"), trigger: "blur", }, @@ -479,8 +479,10 @@ export default { ...this.dataForm, ...res.data, }; - this.morningTime = [res.data.moStartTime,res.data.moEndTime] - this.afterTime = [res.data.afStartTime,res.data.afEndTime] + if(res.data.moStartTime !== ''){ + this.morningTime = [res.data.moStartTime,res.data.moEndTime] + this.afterTime = [res.data.afStartTime,res.data.afEndTime] + } if(!this.dataForm.longitude && !this.dataForm.latitude){ this.dataForm.longitude = "120.38945519" this.dataForm.latitude = "36.0722275" @@ -496,11 +498,11 @@ export default { if (!valid) { return false; } - if(this.morningTime === null && this.dataForm.noAvailableVaccines !== '1'){ + if(this.morningTime === null && this.dataForm.noAvailableVaccines === '2'){ this.$message.error('请填写上午接种时间'); return false } - if(this.afterTime === null && this.dataForm.noAvailableVaccines !== '1'){ + if(this.afterTime === null && this.dataForm.noAvailableVaccines === '2'){ this.$message.error('请填写下午接种时间'); return false }