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

src/core/antd.less

@@ -514,6 +514,7 @@ mr0 {
 
 // 气泡
 .ant-tooltip {
+  max-width: 280px !important;
   .ant-tooltip-content {
     .ant-tooltip-inner {
       padding: 6px 12px !important;

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-17 14:30:50
+ * @LastEditTime: 2021-08-17 14:50:08
  * @Description: 任务中心-培训任务-新建页面
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -299,7 +299,7 @@ function AddTrainTask() {
 
     if (assignList.length === 0) {
       activeStep === 'TRAIN_CONTENT' && setActiveStep('BASIC_INFO');
-      return message.warning('请选择指派对象');
+      return message.warning('请选择指派学员');
     }
     if (stageList.length === 0) {
       activeStep === 'BASIC_INFO' && setActiveStep('TRAIN_CONTENT');

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 14:30:56
+ * @LastEditTime: 2021-08-17 14:50:30
  * @Description: 任务中心-培训任务-新建-基本信息
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -39,7 +39,7 @@ function BasicInfo(props) {
   const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
   const isDefaultCover = coverUrl === defaultCover;
 
-  const [assignorModalVisible, setAssignorModalVisible] = useState(false); // 指派对象弹窗显隐
+  const [assignorModalVisible, setAssignorModalVisible] = useState(false); // 指派学员弹窗显隐
   const [collaboratorModalVisible, setCollaboratorModalVisible] = useState(false); // 协同者弹窗显隐
 
   // 使用默认封面图
@@ -252,8 +252,8 @@ function BasicInfo(props) {
         <FormItem
           label={
             <span>
-              指派对象
-              <Tooltip title='选择员工协同完成任务指派和督学工作'>
+              指派学员
+              <Tooltip title='选择需要培训的人员'>
                 <i
                   className='icon iconfont'
                   style={{
@@ -270,13 +270,13 @@ function BasicInfo(props) {
           }
           required
           validateStatus={startCheck && assignList.length === 0 ? 'error' : ''}
-          help={startCheck && assignList.length === 0 && '请选择指派对象'}>
+          help={startCheck && assignList.length === 0 && '请选择指派学员'}>
           <Button
             style={{ display: 'block' }}
             onClick={() => {
               setAssignorModalVisible(true);
             }}>
-            添加指派对象
+            添加指派学员
           </Button>
           {assignList.length > 0 && (
             <Space size={'12'} direction={'vertical'} className='select-obj'>
@@ -323,7 +323,7 @@ function BasicInfo(props) {
           label={
             <span>
               协同人员
-              <Tooltip title='选择需要培训的人员'>
+              <Tooltip title='选择员工协同完成任务指派和督学工作'>
                 <i
                   className='icon iconfont'
                   style={{

src/modules/task-center/train-task/modal/ChooseAssignorModal.jsx

@@ -2,8 +2,8 @@
  * @Author: yuananting
  * @Date: 2021-08-05 17:09:36
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-16 20:35:24
- * @Description: 新建培训任务-选择指派对象
+ * @LastEditTime: 2021-08-17 14:50:50
+ * @Description: 新建培训任务-选择指派学员
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -36,7 +36,7 @@ function ChooseAssignorModal(props) {
   const [dropDownVisible, setDropDownVisible] = useState(false);
   const [structureData, setStructureData] = useState([]);
   const [activeKey, setActiveKey] = useState('departMentTab');
-  const [checkedAssignorList, setCheckedAssignorList] = useState(props.currentAssignorList || []); // 勾选的指派对象
+  const [checkedAssignorList, setCheckedAssignorList] = useState(props.currentAssignorList || []); // 勾选的指派学员
   const [checkedAssignorKeys, setCheckedAssignorKeys] = useState(props.currentAssignorList.map((item) => item.checkedId) || []);
   const [queryName, setQueryName] = useState(''); // 搜索框内的值
   const [departmentUserVOList, setDepartmentUserVOList] = useState([]);