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

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

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-07-29 13:57:03
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-16 19:47:41
+ * @LastEditTime: 2021-08-17 12:39:38
  * @Description: 任务中心-培训任务-新建页面
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -74,6 +74,7 @@ function AddTrainTask() {
         }).then((res) => {
           const {
             result: {
+              created,
               createId,
               taskName,
               courseMediaVOS,
@@ -117,7 +118,7 @@ function AddTrainTask() {
             coverId,
             helpStoreUserIds: _helpStoreUserIds,
             timeType,
-            startTime,
+            startTime: timeType === 'FOREVER' ? created : startTime,
             endTime,
             learnType,
           };
@@ -342,13 +343,6 @@ function AddTrainTask() {
         startTime: value && value[0]?.valueOf(),
         endTime: value && value[1]?.valueOf(),
       });
-    } else if (field === 'timeType' && value === 'FOREVER') {
-      setBasicInfo({
-        ...basicInfoRef.current,
-        [field]: value,
-        startTime: null,
-        endTime: null,
-      });
     } else {
       setBasicInfo({
         ...basicInfoRef.current,

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

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-07-29 14:32:24
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-17 11:20:00
+ * @LastEditTime: 2021-08-17 11:39:13
  * @Description: 任务中心-培训任务-新建-基本信息
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -184,7 +184,7 @@ function BasicInfo(props) {
                           }}
                           disabledDate={disabledDate}
                           disabledTime={disabledRangeTime}
-                          disabled={[type === 'edit' && originTimeType === 'VALIDITY' && taskState === 'STARTING', false]}
+                          disabled={[type === 'edit' && taskState === 'STARTING', false]}
                           value={[startTime ? moment(Number(startTime)) : null, endTime ? moment(Number(endTime)) : null]}
                           format='YYYY-MM-DD HH:mm'
                           onChange={(date) => {