From 817cbd0200f5f0704e817608d46edab926d74b2d Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 14:34:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 2 +- .../plugins/point/icpointvaccinesinoculation-add-or-update.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index fcf09c4b..9026eaa5 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -398,7 +398,7 @@ export default { ) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.internalMsg); + return this.$message.error(res.internalMsg ? res.msg : res.internalMsg); } this.$message({ message: this.$t("prompt.success"), 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 ff8fa54e..686fbad8 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -509,7 +509,7 @@ export default { ) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.internalMsg); + return this.$message.error(res.internalMsg ? res.msg : res.internalMsg); } this.$message({ message: this.$t("prompt.success"), From c7b4f96edba3924f656fda52583b01df1245078a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 14:55:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/point/icpointnucleicmonitoring-add-or-update.vue | 2 +- .../plugins/point/icpointvaccinesinoculation-add-or-update.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index cb89b897..9551e459 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -417,7 +417,7 @@ export default { ) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.internalMsg ? res.msg : res.internalMsg); + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg); } this.$message({ message: this.$t("prompt.success"), 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 96ad285e..4fa1afa4 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -510,7 +510,7 @@ export default { ) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.internalMsg ? res.msg : res.internalMsg); + return this.$message.error(res.internalMsg ? res.internalMsg : res.msg); } this.$message({ message: this.$t("prompt.success"), From c3c921dbb16a9c3e02ba63e58c5c2fc9a4e93b8e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 30 Jun 2022 15:10:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=20PC=20=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../point/icpointvaccinesinoculation-add-or-update.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4fa1afa4..763ad21f 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -496,11 +496,11 @@ export default { if (!valid) { return false; } - if(this.morningTime === null){ + if(this.morningTime === null && this.dataForm.noAvailableVaccines !== '1'){ this.$message.error('请填写上午接种时间'); return false } - if(this.afterTime === null ){ + if(this.afterTime === null && this.dataForm.noAvailableVaccines !== '1'){ this.$message.error('请填写下午接种时间'); return false }