1

src/views/system/announcement.vue

@@ -190,23 +190,17 @@
         <el-form-item label="发布配置：" prop="pushDateTime">
           <el-date-picker v-model="updateFormModel.pushDateTime" type="datetime" placeholder="选择日期时间" :picker-options="pickerOptions" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
-        <el-form-item label="时间配置：" prop="key2">
+        <el-form-item label="时间配置：" prop="msgWarnTime">
           <span>剩余</span>
           <span style="margin-left: 5px">
-            <el-select v-model="updateFormModel.key2Val" clearable filterable size="small" style="width: 90px;" placeholder="分钟" disabled>
+            <el-select v-model="updateFormModel.msgWarnTime" clearable filterable size="small" style="width: 90px;" placeholder="分钟">
                 <el-option v-for="i in 60" :label="`${i}分钟`" :value="i"></el-option>
               </el-select>
           </span>
           <span style="margin-left: 5px">进行提醒，</span>
           <span style="margin-left: 5px">
-            <el-select v-model="updateFormModel.key2Val1" clearable filterable size="small" style="width: 70px;" placeholder="时间" disabled>
-                <el-option v-for="i in 60" :label="i" :value="i"></el-option>
-              </el-select>
-          </span>
-          <span style="margin-left: 5px">
-            <el-select v-model="updateFormModel.key2Val2" clearable filterable size="small" style="width: 80px;" placeholder="单位" disabled>
-                <el-option label="分钟" value="1"></el-option>
-                <el-option label="秒钟" value="2"></el-option>
+            <el-select v-model="updateFormModel.msgCountDownTime" clearable filterable size="small" style="width: 90px;" placeholder="时间">
+                <el-option v-for="i in 60" :label="`${i}分钟`" :value="i"></el-option>
               </el-select>
           </span>
           <span style="margin-left: 5px">开始进入倒计时</span>
@@ -276,8 +270,21 @@ export default {
         updateCodeType: [
           { required: true, message: '请选择更新原因', trigger: 'blur' }
         ],
-        pushDateTime: [
-          { required: true, message: '请选择发布配置', trigger: 'blur' }
+        pushDateTime: [{
+          required: true, trigger: 'blur',
+          validator: (rule, value, callback) => {
+            const {msgCountDownTime} = this.updateFormModel
+            if (!value) {
+              callback(new Error('请选择剩余进行提醒时间'));
+            } else if (!msgCountDownTime) {
+              callback(new Error('请选择进入倒计时时间'));
+            } else {
+              callback();
+            }
+          }
+        }],
+        msgWarnTime: [
+          { required: true, message: '请选择时间配置', trigger: 'blur' }
         ],
         pushSystem: [
           { required: true, message: '请选择涉及系统', trigger: 'blur' }