From b6d08ef0a438f7403b899f347903247fa8d96dec Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Fri, 12 Jan 2024 15:32:39 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/ztzh/zttj-web
---
src/views/evaluate/components/addIndividualTask.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/views/evaluate/components/addIndividualTask.vue b/src/views/evaluate/components/addIndividualTask.vue
index 0f927c7..b321006 100644
--- a/src/views/evaluate/components/addIndividualTask.vue
+++ b/src/views/evaluate/components/addIndividualTask.vue
@@ -60,7 +60,7 @@
<el-input type="textarea" v-model="taskTypeForm.standard" placeholder="请输入认定标准"></el-input>
</el-form-item>
<el-form-item label="名额" prop="peopleNum">
- <el-input-number v-model="taskTypeForm.peopleNum" placeholder="请输入名额数量" controls-position="right"></el-input-number>
+ <el-input-number :min="1" v-model="taskTypeForm.peopleNum" placeholder="请输入名额数量" controls-position="right" style="width: 100%;"></el-input-number>
</el-form-item>
</el-form>
<template #footer>
@@ -89,8 +89,6 @@
return {
visible: false,
title: '添加个人评优任务',
- isEdit: false,
- addForm: {},
};
},
},
@@ -117,9 +115,43 @@
],
candidateCutoffTimeStart: [
{ required: true, message: '请选择任务开始时间', trigger: 'click' },
+ {
+ validator: (rule, value, callback) => {
+ if (value) {
+ const startTime = new Date(value).getTime()
+ const endTime = new Date(this.form.candidateCutoffTimeEnd).getTime()
+ const nowTime = new Date().getTime()
+ // if (nowTime > startTime) {
+ // callback(new Error('开始时间不能早于当前时间'))
+ // } else
+ if (startTime >= endTime) {
+ callback(new Error('结束时间不能早于等于开始时间'))
+ } else {
+ callback()
+ }
+ }
+ }, trigger: 'click'
+ }
],
candidateCutoffTimeEnd: [
{ required: true, message: '请选择任务开始时间', trigger: 'click' },
+ {
+ validator: (rule, value, callback) => {
+ if (value) {
+ const startTime = new Date(this.form.candidateCutoffTimeStart).getTime()
+ const endTime = new Date(value).getTime()
+ const nowTime = new Date().getTime()
+ // if (nowTime > endTime) {
+ // callback(new Error('结束时间不能早于等于当前时间'))
+ // } else
+ if (startTime >= endTime) {
+ callback(new Error('结束时间不能早于等于开始时间'))
+ } else {
+ callback()
+ }
+ }
+ }, trigger: 'click'
+ }
]
},
taskTypeRules: {
@@ -158,9 +190,7 @@
this.$refs.taskTypeFormRef.validate(vaild => {
if (!vaild) return
const curValue = _.cloneDeep(this.taskTypeForm)
- console.log(curValue);
this.form.categoryEntities.push(curValue)
- console.log(this.form.categoryEntities);
this.innerVisible = false
})
},
--
Gitblit v1.9.3