feat:修改视频课关联培训计划

src/data-source/store/request-apis.ts

 /*
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
- * @LastEditors: wufan
- * @LastEditTime: 2021-01-11 19:38:50
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-03-08 11:47:58
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -68,3 +68,9 @@ export function delCourseCategory(params: object) {
 export function getStoreUserBasicPage(params: object) {
   return Service.Hades("public/hades/getStoreUserBasicPage", params);
 }
+export function updateStoreMessage(params: object) {
+  return Service.Hades("public/hades/updateStoreMessage", params);
+}
+export function getStoreDetail(params: object) {
+  return Service.Hades("public/hades/getStoreDetail", params);
+}
\ No newline at end of file

src/domains/store-domain/constants.ts

+/*
+ * @Author: zhangleyuan
+ * @Date: 2021-01-19 11:27:56
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-03-08 10:36:04
+ * @Description: 描述一下
+ * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
+ */
 
 export const storeRoleEnum = {
     "0": "店铺管理员",
     "1": "管理员",
     "2": "普通讲师"
-};
\ No newline at end of file
+};
+export const industryList = ["IT服务","制造业","批发/零售","生活服务","文化/体育/娱乐业","建筑/房地产","教育","运输/物流/仓储","医疗","政府","金融","能源/采矿","农林渔牧","其他行业"];
+
+export const childIndustryList = {
+    "IT服务":["计算机软件/硬件/信息服务","互联网和相关服务","其他"],
+    "制造业":["机械/电子","服装/纺织","汽车","金属制品","家具/家纺","重工制造","家电/数码","橡胶/塑料","日用品/化妆品","化学原料制品","文教/工美/体育/娱乐用品","烟酒/茶","非金属矿物","其他"],
+    "批发/零售":["批发","零售","超市/便利店/百货商场","进出口","其他"],
+    "生活服务":["餐饮","居民服务","租赁和商务服务","酒店/住宿","其他"],
+    "文化/体育/娱乐业":["文化/体育","娱乐/旅游","新闻传媒","其他"],
+    "建筑/房地产":["建筑业","建材装修","房地产","其他"],
+    "教育":["学前教育","初中等教育","高等教育","培训机构","其他"],
+    "运输/物流/仓储":["物流/仓储","道路/铁路运输","邮政/快递","航空运输","水上运输","其他"],
+    "医疗":["医院/医疗机构","医疗器械","医药制造","医药流通","其他"],
+    "政府":["党政机关","国家权利/行政机构","检察院/法院/公安","民政/人社/交通/卫生","发改委/经信委/商务局/统计局","国土/规划","税务/海关/工商/环保/物价/药品","政协/民主党派","地方政府","其他"],
+    "金融":["保险","银行","证券/投资/基金","其他"],
+    "能源/采矿":["电力/热力/燃气/水供应业","石油/天然气","煤炭","有色金属","钢铁","其他"],
+    "农林渔牧":["农林渔牧"],
+    "其他行业":["科学研究和技术服务业","社会组织","水利和环境管理","国际组织","其他"]
+}
\ No newline at end of file

src/domains/store-domain/storeService.ts

@@ -2,11 +2,13 @@
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-23 16:54:10
+ * @LastEditTime: 2021-03-08 11:48:43
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
-import { getEmployeeList, getUserList, getStoreDecorationList, getStoreRole, addEmployee, editEmployee, deleteEmployee, getCourseCatalogList, getAllSonCategory, addCourseCategory, delCourseCategory, editCourseCategory, deleteStoreDecorationList, addStoreBanner, editStoreBanner, moveBannerSequence,getStoreUserBasicPage} from '@/data-source/store/request-apis';
+import { getEmployeeList, getUserList, getStoreDecorationList, getStoreRole, addEmployee, editEmployee, deleteEmployee, getCourseCatalogList,
+   getAllSonCategory, addCourseCategory, delCourseCategory, editCourseCategory, deleteStoreDecorationList, addStoreBanner, editStoreBanner,
+    moveBannerSequence,getStoreUserBasicPage,updateStoreMessage,getStoreDetail} from '@/data-source/store/request-apis';
 
 export default class StoreService {
   // 获取员工列表 
@@ -81,5 +83,10 @@ export default class StoreService {
   static delCourseCategory(params: any) {
     return delCourseCategory(params);
   }
-  
+  static updateStoreMessage(params: any) {
+    return updateStoreMessage(params);
+  }
+  static getStoreDetail(params: any) {
+    return getStoreDetail(params);
+  }
 }
\ No newline at end of file

src/modules/course-manage/components/LiveCourseList.jsx

@@ -57,7 +57,8 @@ class LiveCourseList extends React.Component {
       columns: [],
       openDownloadModal:false,
       url:'',
-      RelatedPlanModalVisible:false
+      RelatedPlanModalVisible:false,
+      selectPlanList:{}
     }
   }
   componentWillMount(){
@@ -537,7 +538,7 @@ class LiveCourseList extends React.Component {
   renderMoreOperate = (item) => {
     return (
       <div className="live-course-more-menu">
-           <div
+          <div
             className="operate__item"
             onClick={()=>this.handleRelatedModalShow(item)}
           >关联培训计划</div>
@@ -662,9 +663,21 @@ class LiveCourseList extends React.Component {
     window.open(htmlUrl);
   }
   handleRelatedModalShow = (item)=>{
+
+    const selectPlanList = {};
+    if(item.relatedPlanList){
+      item.relatedPlanList.map((item,index)=>{
+        selectPlanList[item.planId] = {}
+        selectPlanList[item.planId].planId = item.planId;
+        selectPlanList[item.planId].taskBaseVOList = [{taskId:item.taskId}];
+        return item
+      })
+    }
+
     this.setState({
       RelatedPlanModalVisible:true,
-      selectCourseId:item.liveCourseId
+      selectCourseId:item.liveCourseId,
+      selectPlanList:selectPlanList
     })
   }
   closeRelatedPlanModalVisible = ()=>{
@@ -672,6 +685,16 @@ class LiveCourseList extends React.Component {
       RelatedPlanModalVisible:false
     })
   }
+  onChangeSelectPlanList = (selectPlanList)=>{
+    this.setState({
+      selectPlanList:selectPlanList
+    })
+  }
+  onConfirmSelectPlanList = ()=>{
+    this.setState({
+      RelatedPlanModalVisible:false
+    },()=>{this.props.onChange();})
+  }
   render() {
     const { total, query, courseList, loading} = this.props;
     const { current, size } = query;
@@ -680,7 +703,8 @@ class LiveCourseList extends React.Component {
       openCoursewareModal,
       editData,
       RelatedPlanModalVisible,
-      selectCourseId
+      selectCourseId,
+      selectPlanList
     } = this.state;
     const { match } = this.props;
     
@@ -736,6 +760,9 @@ class LiveCourseList extends React.Component {
             onClose={this.closeRelatedPlanModalVisible}
             visible={RelatedPlanModalVisible}
             selectCourseId={selectCourseId}
+            selectPlanList={selectPlanList}
+            onChange={this.onChangeSelectPlanList}
+            onConfirm={this.onConfirmSelectPlanList}
           />
         }
         <iframe src={url} style={{ display: "none" }} />

src/modules/course-manage/modal/RelatedPlanModal.jsx

@@ -20,10 +20,10 @@ class RelatedPlanModal extends React.Component {
       selectPlanList:{},
     };
   }
+
   componentDidMount() {
     this.handleFetchDataList();
   }
- 
   // 获取培训计划列表
   handleFetchDataList = () => {
     const {query,size,totalCount} = this.state
@@ -92,7 +92,7 @@ class RelatedPlanModal extends React.Component {
     return columns;
   }
   selectPlanList = (record,selected,planId) =>{
-    const { selectPlanList } = this.state;
+    const { selectPlanList } = this.props;
     let _selectPlanList = {...selectPlanList};
     
     if (selected) { 
@@ -109,7 +109,8 @@ class RelatedPlanModal extends React.Component {
       _selectPlanList[planId].taskBaseVOList = [];
       _selectPlanList[planId].planId =  planId;
     }
-    this.setState({selectPlanList:_selectPlanList});
+    this.props.onChange(_selectPlanList);
+    // this.setState({selectPlanList:_selectPlanList});
   }
   handleSelectPlanListData(selectPlanList){
     let _selectPlanList = [];
@@ -124,19 +125,19 @@ class RelatedPlanModal extends React.Component {
     return _selectPlanList;
   }
   confirmRelatedPlan =()=>{
-    const {selectPlanList } = this.state;
+    const {selectPlanList } = this.props;
     const params = {
       courseId:this.props.selectCourseId,
       relatedPlanList:this.handleSelectPlanListData(selectPlanList),
       storeId:User.getStoreId(),
     }
     CourseService.relatedCourseToPlan(params).then((res) => {
-      this.props.onClose();
+      this.props.onConfirm();
     });
   }
   render() {
-    const { size,dataSource,totalCount,query,selectOperatorList,selectPlanList} = this.state;
-    const { visible } = this.props;
+    const { size,dataSource,totalCount,query} = this.state;
+    const { visible,selectPlanList} = this.props;
     return (
         <Modal
           title="关联培训计划"
@@ -159,7 +160,7 @@ class RelatedPlanModal extends React.Component {
           </div>
           <div className="select-container">
             <span className="icon iconfont tip">&#xe6f2;</span>
-            <span className="text">已选择3个任务</span>
+            <span className="text">已选择个任务</span>
             <span className="clear">清空</span>
           </div>
           <div>

src/modules/course-manage/video-course/components/VideoCourseList.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:12:45
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-02-01 16:34:11
+ * @LastEditTime: 2021-03-08 15:07:16
  * @Description: 视频课-列表模块
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -17,21 +17,23 @@ import { appId, shareUrl, LIVE_SHARE } from '@/domains/course-domain/constants';
 import ShareLiveModal from '@/modules/course-manage/modal/ShareLiveModal';
 import WatchDataModal from '../modal/WatchDataModal'
 import CourseService from "@/domains/course-domain/CourseService";
-
+import RelatedPlanModal from '../../modal/RelatedPlanModal';
 import User from '@/common/js/user'
 
 
 import './VideoCourseList.less';
 
 const ENV = process.env.DEPLOY_ENV || 'dev';
-
+const userRole =  User.getUserRole();
 class VideoCourseList extends React.Component {
 
   constructor(props) {
     super(props);
     this.state = {
       id: '', // 视频课ID
-      studentIds:[]
+      studentIds:[],
+      RelatedPlanModalVisible:false,
+      selectPlanList:{}
     }
   }
 
@@ -166,6 +168,25 @@ class VideoCourseList extends React.Component {
         }
       },
       {
+        title: '关联项',
+        width: 200,
+        key: "planList",
+        dataIndex: "planList",
+        render: (val, record) => {
+          return  (
+            <span>
+                { record.relatedPlanList ?
+                  record.relatedPlanList.map((item,index)=>{
+                    return <span>{item.planName} { (index < record.relatedPlanList.length-1)&&(<span> 、</span>)} </span>
+                  })
+                  :
+                  <span></span>
+                }
+            </span>
+          )
+        }
+      },
+      {
         title: '操作',
         key: 'operate',
         dataIndex: 'operate',
@@ -200,6 +221,12 @@ class VideoCourseList extends React.Component {
   renderMoreOperate = (item) => {
     return (
       <div className="live-course-more-menu">
+        { (userRole === "CloudManager" || userRole === "StoreManager") &&
+           <div
+            className="operate__item"
+            onClick={()=>this.handleRelatedModalShow(item)}
+          >关联培训计划</div>
+        }
           <div
             className="operate__item"
             onClick={() => {
@@ -237,6 +264,7 @@ class VideoCourseList extends React.Component {
       }
     }) 
   }
+  
   // 删除视频课
   handleDeleteVideoCourse = (scheduleId) => {
     Modal.confirm({
@@ -314,12 +342,42 @@ class VideoCourseList extends React.Component {
     };
     this.props.onChange(_query);
   }
-  
+  handleRelatedModalShow = (item)=>{
+    const selectPlanList = {};
+    if(item.relatedPlanList){
+      item.relatedPlanList.map((item,index)=>{
+        selectPlanList[item.planId] = {}
+        selectPlanList[item.planId].planId = item.planId;
+        selectPlanList[item.planId].taskBaseVOList = [{taskId:item.taskId}];
+        return item
+      })
+    }
+    this.setState({
+      RelatedPlanModalVisible:true,
+      selectCourseId:item.id,
+      selectPlanList:selectPlanList
+    })
+  }
+  closeRelatedPlanModalVisible = ()=>{
+    this.setState({
+      RelatedPlanModalVisible:false
+    })
+  }
+  onChangeSelectPlanList = (selectPlanList)=>{
+    this.setState({
+      selectPlanList:selectPlanList
+    })
+  }
+  onConfirmSelectPlanList = ()=>{
+    this.setState({
+      RelatedPlanModalVisible:false
+    },()=>{this.props.onChange();})
+  }
   render() {
 
     const { dataSource = [], totalCount, query } = this.props;
     const { current, size } = query;
-
+    const {RelatedPlanModalVisible,selectPlanList,selectCourseId} = this.state;
     return (
       <div className="video-course-list">
         <Table
@@ -344,6 +402,16 @@ class VideoCourseList extends React.Component {
             }}
           />
         </div>   
+        { RelatedPlanModalVisible &&
+          <RelatedPlanModal 
+            onClose={this.closeRelatedPlanModalVisible}
+            visible={RelatedPlanModalVisible}
+            selectCourseId={selectCourseId}
+            selectPlanList={selectPlanList}
+            onChange={this.onChangeSelectPlanList}
+            onConfirm={this.onConfirmSelectPlanList}
+          />
+        }
         { this.state.shareLiveModal }
         { this.state.watchDataModal }
       </div>