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/addSectionTask.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/evaluate/components/addSectionTask.vue b/src/views/evaluate/components/addSectionTask.vue
index e8317a6..366e638 100644
--- a/src/views/evaluate/components/addSectionTask.vue
+++ b/src/views/evaluate/components/addSectionTask.vue
@@ -19,13 +19,13 @@
</el-checkbox-group>
</el-form-item>
<el-form-item label="投票时间" required>
- <el-form-item class="time-box" prop="candidateCutoffTimeStart">
- <el-date-picker v-model="form.candidateCutoffTimeStart" type="datetime" placeholder="请选择任务开始时间"
+ <el-form-item class="time-box" prop="evaluateCutoffTimeStart">
+ <el-date-picker v-model="form.evaluateCutoffTimeStart" type="datetime" placeholder="请选择任务开始时间"
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
</el-form-item>
<span class="time-span">至</span>
- <el-form-item class="time-box" prop="candidateCutoffTimeEnd">
- <el-date-picker v-model="form.candidateCutoffTimeEnd" type="datetime" placeholder="请选择任务结束时间"
+ <el-form-item class="time-box" prop="evaluateCutoffTimeEnd">
+ <el-date-picker v-model="form.evaluateCutoffTimeEnd" type="datetime" placeholder="请选择任务结束时间"
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
</el-form-item>
</el-form-item>
@@ -40,10 +40,11 @@
<script>
import { getDict } from '@/api/dict'
-import { add } from '@/api/evaluate/evaluateTask'
+import { update } from '@/api/evaluate/evaluateTask'
import _ from 'lodash';
export default {
+ inject: ['type'],
props: {
params: {
type: Object,
@@ -64,8 +65,8 @@
evaluateAwards: '',
identificationStandard: '',
pollingPersons: [],
- candidateCutoffTimeStart: '',
- candidateCutoffTimeEnd: ''
+ evaluateCutoffTimeStart: '',
+ evaluateCutoffTimeEnd: ''
},
rules: {
taskName: [
@@ -80,7 +81,7 @@
pollingPersons: [
{ required: true, message: '请选择评定人员', trigger: 'click' },
],
- candidateCutoffTimeStart: [
+ evaluateCutoffTimeStart: [
{ required: true, message: '请选择任务开始时间', trigger: 'click' },
{
validator: (rule, value, callback) => {
@@ -88,9 +89,10 @@
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) {
+ // if (nowTime > startTime) {
+ // callback(new Error('开始时间不能早于当前时间'))
+ // } else
+ if (startTime >= endTime) {
callback(new Error('结束时间不能早于等于开始时间'))
} else {
callback()
@@ -99,7 +101,7 @@
}, trigger: 'click'
}
],
- candidateCutoffTimeEnd: [
+ evaluateCutoffTimeEnd: [
{ required: true, message: '请选择任务开始时间', trigger: 'click' },
{
validator: (rule, value, callback) => {
@@ -107,9 +109,10 @@
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) {
+ // if (nowTime > endTime) {
+ // callback(new Error('结束时间不能早于等于当前时间'))
+ // } else
+ if (startTime >= endTime) {
callback(new Error('结束时间不能早于等于开始时间'))
} else {
callback()
@@ -134,7 +137,8 @@
if (!vaild) return
const data = _.cloneDeep(this.form)
data.pollingPersons = data.pollingPersons.join(',')
- add(data).then(res => {
+ data.type = this.type()
+ update(data).then(res => {
if (res.data.code !== 200) return
this.params.visible = false
this.$emit('refreshTable', { currentPage: 1, pageSize: 10 })
--
Gitblit v1.9.3