From 0690bebd80a6b7e5df5722ee7c031e457b278e12 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 24 Jun 2022 17:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9=20PC=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pointvaccinesinoculation-add-or-update.vue | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 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 7a265b8e..14184c26 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -39,7 +39,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="上午接种时间">
+      <el-form-item label="上午接种时间" prop="startTime">
         <el-time-picker
           is-range
           v-model="startTime"
@@ -51,10 +51,11 @@
           placeholder="选择时间范围"
           @change="startTimeChange"
           :disabled='dialogTitle == "查看"'
+          :clearable="false"
         >
         </el-time-picker>
       </el-form-item>
-      <el-form-item label="下午接种时间">
+      <el-form-item label="下午接种时间" prop="endTime">
         <el-time-picker
           is-range
           v-model="endTime"
@@ -66,6 +67,7 @@
           placeholder="选择时间范围"
           @change="endTimeChange"
           :disabled='dialogTitle == "查看"'
+          :clearable="false"
         >
         </el-time-picker>
       </el-form-item>
@@ -234,34 +236,6 @@ export default {
             trigger: "blur",
           },
         ],
-        moStartTime: [
-          {
-            required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
-          },
-        ],
-        moEndTime: [
-          {
-            required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
-          },
-        ],
-        afStartTime: [
-          {
-            required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
-          },
-        ],
-        afEndTime: [
-          {
-            required: true,
-            message: this.$t("validate.required"),
-            trigger: "blur",
-          },
-        ],
         noAvailableVaccines: [
           {
             required: true,
@@ -312,7 +286,7 @@ export default {
         let hour_0 = Number(this.startTime[0].substring(0, 2));
         let hour_1 = Number(this.startTime[1].substring(0, 2));
         if (hour_0 >= 12 || hour_1 >= 12) {
-          this.$message.error("请选择00:00:00-11:59:59时间段的时间");
+          this.$message.error("请选择00:00-11:59时间段的时间");
           this.startTime = null;
           return false;
         }
@@ -325,7 +299,7 @@ export default {
         let hour_0 = Number(this.endTime[0].substring(0, 2));
         let hour_1 = Number(this.endTime[1].substring(0, 2));
         if (hour_0 < 12 || hour_1 < 12) {
-          this.$message.error("请选择12:00:00-23:59:59时间段的时间");
+          this.$message.error("请选择12:00-23:59时间段的时间");
           this.endTime = null;
           return false;
         }
@@ -496,6 +470,14 @@ export default {
           if (!valid) {
             return false;
           }
+          if(this.startTime === null){
+              this.$message.error('请填写上午接种时间');
+              return false
+          }
+          if(this.endTime === null ){
+              this.$message.error('请填写下午接种时间');
+              return false
+          }
           this.$http[!this.dataForm.id ? "post" : "put"](
             "/epmetuser/icPointVaccinesInoculation/",
             this.dataForm