Merge branch 'feature/zhangleyuan/20200220/training-program' into dev

src/modules/plan-manage/LearningData.jsx

@@ -23,7 +23,8 @@ class LearningData extends React.Component {
       courseNum:0,
       courseNum:0,
       created:"",
       created:"",
       cultureCustomerNum:0,
       cultureCustomerNum:0,
-      activeKey:"employeeShareData"
+      activeKey:"employeeShareData",
+      createName:""
     }
     }
   }
   }
   componentDidMount(){
   componentDidMount(){
@@ -41,7 +42,8 @@ class LearningData extends React.Component {
             courseMediaVOS,
             courseMediaVOS,
             courseNum,
             courseNum,
             created,
             created,
-            cultureCustomerNum
+            cultureCustomerNum,
+            createName
         } = res.result;
         } = res.result;
         let coverUrl;
         let coverUrl;
         courseMediaVOS.map((item) => {
         courseMediaVOS.map((item) => {
@@ -55,12 +57,13 @@ class LearningData extends React.Component {
           coverUrl: coverUrl || defaultCover,
           coverUrl: coverUrl || defaultCover,
           courseNum,
           courseNum,
           created,
           created,
-          cultureCustomerNum
+          cultureCustomerNum,
+          createName
         })
         })
     })
     })
   }
   }
   render() {
   render() {
-    const {planName,coverUrl,courseNum,created,cultureCustomerNum,activeKey} = this.state;
+    const {planName,coverUrl,courseNum,created,cultureCustomerNum,activeKey,createName} = this.state;
     return (
     return (
       <div className="page plan-learn-data-list">
       <div className="page plan-learn-data-list">
         <Breadcrumbs
         <Breadcrumbs
@@ -79,7 +82,7 @@ class LearningData extends React.Component {
                 {planName}
                 {planName}
               </div>
               </div>
               <div className="create-course">
               <div className="create-course">
-                <span className="createUser">创建人：张老师</span>
+                <span className="createUser">创建人：{createName}</span>
                 <span className="split">|</span>
                 <span className="split">|</span>
                 <span className="course-total">课程总数量：{courseNum}</span>
                 <span className="course-total">课程总数量：{courseNum}</span>
               </div>
               </div>

src/modules/plan-manage/components/UserLearningDataFilter.jsx

@@ -190,6 +190,7 @@ function UserLearningDataFilter(props) {
                     onChange={(value) => { handleChangeQuery('learnState', value) }}
                     onChange={(value) => { handleChangeQuery('learnState', value) }}
                     suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>}
                     suffixIcon={<span className="icon iconfont" style={{fontSize:'12px',color:'#BFBFBF'}}>&#xe835;</span>}
                   >
                   >
+                    <Option value="UN_PLAY">未开始</Option>
                     <Option value="UNDER_WAY">进行中</Option>
                     <Option value="UNDER_WAY">进行中</Option>
                     <Option value="FINISH">已完成</Option>
                     <Option value="FINISH">已完成</Option>
                   </Select>
                   </Select>

src/modules/plan-manage/modal/relatedCourseModal.jsx

@@ -405,7 +405,9 @@ class SelectOperatorModal extends React.Component {
                                       }
                                       }
                                       if(_list.length + currentTaskCourseData.length + selectLive.length> 20){
                                       if(_list.length + currentTaskCourseData.length + selectLive.length> 20){
                                         message.warning('无法继续选择，一个任务最多关联20个课程');
                                         message.warning('无法继续选择，一个任务最多关联20个课程');
-                                        return;
+                                        console.log('1111');
+                                        const extraLength = (_list.length + currentTaskCourseData.length + selectLive.length) -20;
+                                        _list.splice(_list.length - extraLength,extraLength);
                                       }
                                       }
                                       this.setState({selectVideo:_list});
                                       this.setState({selectVideo:_list});
                                     },
                                     },
@@ -469,7 +471,10 @@ class SelectOperatorModal extends React.Component {
                                     }
                                     }
                                     if(_list.length + currentTaskCourseData.length + selectVideo.length> 20){
                                     if(_list.length + currentTaskCourseData.length + selectVideo.length> 20){
                                       message.warning('无法继续选择，一个任务最多关联20个课程');
                                       message.warning('无法继续选择，一个任务最多关联20个课程');
-                                      return;
+                                      const extraLength = (_list.length + currentTaskCourseData.length + selectVideo.length) -20;
+                                      _list.splice(_list.length - extraLength,extraLength);
+                                      console.log('_list',_list);
+
                                     }
                                     }
                                     this.setState({selectLive:_list});
                                     this.setState({selectLive:_list});
                                   },
                                   },