Merge branch 'feature/yuananting/20210801/task-center' into dev

src/modules/task-center/train-task/AddTrainTask.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-07-29 13:57:03
  * @Date: 2021-07-29 13:57:03
  * @LastEditors: yuananting
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-17 12:39:38
+ * @LastEditTime: 2021-08-17 14:30:50
  * @Description: 任务中心-培训任务-新建页面
  * @Description: 任务中心-培训任务-新建页面
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -25,6 +25,7 @@ import $ from 'jquery';
 function AddTrainTask() {
 function AddTrainTask() {
   const type = getParameterByName('type');
   const type = getParameterByName('type');
   const taskId = getParameterByName('taskId');
   const taskId = getParameterByName('taskId');
+  const taskState = getParameterByName('taskState');
 
 
   const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
   const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
 
 
@@ -274,12 +275,28 @@ function AddTrainTask() {
   // 保存
   // 保存
   function handleSubmit(issue) {
   function handleSubmit(issue) {
     setStartCheck(true);
     setStartCheck(true);
-    const { taskName, assignList } = basicInfo;
+    const { taskName, assignList, timeType, startTime, endTime } = basicInfo;
 
 
     if (!taskName) {
     if (!taskName) {
       activeStep === 'TRAIN_CONTENT' && setActiveStep('BASIC_INFO');
       activeStep === 'TRAIN_CONTENT' && setActiveStep('BASIC_INFO');
       return message.warning('请输入培训任务名称');
       return message.warning('请输入培训任务名称');
     }
     }
+
+    if (timeType === 'VALIDITY') {
+      if (!startTime) {
+        return message.warning('请选择开始时间');
+      }
+      if (!endTime) {
+        return message.warning('请选择结束时间');
+      }
+      if ((type === 'add' || taskState === 'UN_START') && startTime < new Date().getTime()) {
+        return message.warning('开始时间不能早于现在');
+      }
+      if (!endTime > new Date().getTime()) {
+        return message.warning('结束时间不能早于现在');
+      }
+    }
+
     if (assignList.length === 0) {
     if (assignList.length === 0) {
       activeStep === 'TRAIN_CONTENT' && setActiveStep('BASIC_INFO');
       activeStep === 'TRAIN_CONTENT' && setActiveStep('BASIC_INFO');
       return message.warning('请选择指派对象');
       return message.warning('请选择指派对象');

src/modules/task-center/train-task/components/BasicInfo.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-07-29 14:32:24
  * @Date: 2021-07-29 14:32:24
  * @LastEditors: yuananting
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-17 13:56:11
+ * @LastEditTime: 2021-08-17 14:30:56
  * @Description: 任务中心-培训任务-新建-基本信息
  * @Description: 任务中心-培训任务-新建-基本信息
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -18,7 +18,6 @@ import './BasicInfo.less';
 import ChooseAssignorModal from '../modal/ChooseAssignorModal';
 import ChooseAssignorModal from '../modal/ChooseAssignorModal';
 import ChooseCollaboratorModal from '../modal/ChooseCollaboratorModal';
 import ChooseCollaboratorModal from '../modal/ChooseCollaboratorModal';
 import WWOpenDataCom from '@/components/WWOpenDataCom';
 import WWOpenDataCom from '@/components/WWOpenDataCom';
-import User from '@/common/js/user';
 
 
 const { RangePicker } = DatePicker;
 const { RangePicker } = DatePicker;
 
 
@@ -119,6 +118,25 @@ function BasicInfo(props) {
     props.onChange('assignList', _assignList);
     props.onChange('assignList', _assignList);
   }
   }
 
 
+  function checkTime() {
+    if (!startTime && !endTime) {
+      return '请选择培训时间';
+    }
+    if (!startTime) {
+      return '请选择开始时间';
+    }
+    if (!endTime) {
+      return '请选择结束时间';
+    }
+    if ((type === 'add' || taskState === 'UN_START') && startTime < new Date().getTime()) {
+      return '开始时间不能早于现在';
+    }
+    if (!endTime > new Date().getTime()) {
+      return '结束时间不能早于现在';
+    }
+    return false;
+  }
+
   return (
   return (
     <div className='basic-info__form'>
     <div className='basic-info__form'>
       <Form>
       <Form>
@@ -171,9 +189,7 @@ function BasicInfo(props) {
                   固定时间段
                   固定时间段
                   {timeType === 'VALIDITY' && (
                   {timeType === 'VALIDITY' && (
                     <div className='picker-box'>
                     <div className='picker-box'>
-                      <FormItem
-                        validateStatus={startCheck && !startTime && !endTime ? 'error' : ''}
-                        help={startCheck && !startTime && !endTime && '请选择培训时间'}>
+                      <FormItem validateStatus={startCheck && checkTime() ? 'error' : ''} help={startCheck && checkTime()}>
                         <RangePicker
                         <RangePicker
                           style={{ width: 320 }}
                           style={{ width: 320 }}
                           showTime={{ defaultValue: [moment().add(10, 'minutes'), moment().add(10, 'minutes')] }}
                           showTime={{ defaultValue: [moment().add(10, 'minutes'), moment().add(10, 'minutes')] }}