From d13cebe7fbadd396e91a989af331df8a8e7b40f8 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 11:40:42 +0800
Subject: [PATCH] 考核结果查看详情

---
 src/views/evaluate/components/addIndividualTask.vue |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/views/evaluate/components/addIndividualTask.vue b/src/views/evaluate/components/addIndividualTask.vue
index 0f927c7..600ec37 100644
--- a/src/views/evaluate/components/addIndividualTask.vue
+++ b/src/views/evaluate/components/addIndividualTask.vue
@@ -5,10 +5,10 @@
                 <el-form-item label="任务名称" prop="taskName">
                     <el-input v-model="form.taskName" placeholder="请输入任务名称"></el-input>
                 </el-form-item>
-                <el-form-item label="评优类别" prop="categoryEntities">
+                <el-form-item label="评优奖项" prop="categoryEntities">
                     <ul class="type-list">
                         <li class="type-item">
-                            <div class="title">类别</div>
+                            <div class="title">奖项</div>
                             <div class="introduction">认定标准</div>
                             <div class="number">名额</div>
                             <div class="tool">操作</div>
@@ -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