Commit 34ebca15 by zhangleyuan

feat:处理完成标准不能输入小数

parent 3de96d01
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:13:39 * @Date: 2021-02-20 16:13:39
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-09 18:02:17 * @LastEditTime: 2021-03-10 14:00:44
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -122,6 +122,18 @@ function AddPlan() { ...@@ -122,6 +122,18 @@ function AddPlan() {
message.warning('请输入的培训计划名称'); message.warning('请输入的培训计划名称');
return; return;
} }
if(operateType==='Assign_Operate' && selectOperatorList.length===0){
message.warning('请选择指定运营师');
return;
}
if(!percentCompleteLive && percentCompleteLive !==0 ){
message.warning('请输入完成标准');
return;
}
if(!percentCompleteVideo && percentCompleteVideo !==0 ){
message.warning('请输入完成标准');
return;
}
if(taskList.length === 0){ if(taskList.length === 0){
message.warning('请输入培训计划内容'); message.warning('请输入培训计划内容');
return; return;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:13:39 * @Date: 2021-02-20 16:13:39
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-01 13:41:08 * @LastEditTime: 2021-03-10 11:31:52
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -45,7 +45,7 @@ function PlanPage() { ...@@ -45,7 +45,7 @@ function PlanPage() {
<div className="page"> <div className="page">
<div className="content-header">培训计划</div> <div className="content-header">培训计划</div>
<div className="box"> <div className="box">
<PlanFilter onChange={handleFetchPlanList}/> <PlanFilter onChange={queryChange}/>
<PlanOpt/> <PlanOpt/>
<PlanList <PlanList
planListData={planListData} planListData={planListData}
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:45:51 * @Date: 2021-02-20 16:45:51
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-09 18:04:58 * @LastEditTime: 2021-03-10 13:54:39
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
import React from 'react'; import React from 'react';
import { Button,Input,Switch,Radio,Row,Col,Modal,message} from 'antd'; import { Button,Input,Switch,Radio,Row,Col,Modal,message,InputNumber} from 'antd';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import SelectOperatorModal from '../modal/SelectOperatorModal'; import SelectOperatorModal from '../modal/SelectOperatorModal';
import { ImgCutModalNew } from '@/components'; import { ImgCutModalNew } from '@/components';
...@@ -179,6 +179,15 @@ class BasicInfo extends React.Component{ ...@@ -179,6 +179,15 @@ class BasicInfo extends React.Component{
} }
return new Blob([ab], { type: "image/png" }); return new Blob([ab], { type: "image/png" });
}; };
limitNumber = value => {
if (typeof value === 'string') {
return !isNaN(Number(value)) ? value.replace(/^(0+)|[^\d]/g, '') : ''
} else if (typeof value === 'number') {
return !isNaN(value) ? String(value).replace(/^(0+)|[^\d]/g, '') : ''
} else {
return ''
}
}
percentCompleteBlur = (e,field) =>{ percentCompleteBlur = (e,field) =>{
let _percentCompleteLive; let _percentCompleteLive;
const { value } = e.target; const { value } = e.target;
...@@ -294,11 +303,25 @@ class BasicInfo extends React.Component{ ...@@ -294,11 +303,25 @@ class BasicInfo extends React.Component{
<div> <div>
<div className="live-standard-info"> <div className="live-standard-info">
<span className="icon iconfont">&#xe865;</span> <span className="icon iconfont">&#xe865;</span>
<span>直播课单个课程,用户学习进度达到<Input type="number" width="40" value={percentCompleteLive} onChange={(e) => { this.props.onChange('percentCompleteLive', e.target.value) }} onBlur={(e)=>this.percentCompleteBlur(e,'percentCompleteLive')}/>% 即视为“已完成”学习</span> <span>直播课单个课程,用户学习进度达到
<Input
width="40"
value={percentCompleteLive}
onChange={(e) => { this.props.onChange('percentCompleteLive', e.target.value.replace(/\D/g,'')) }}
onBlur={(e)=>this.percentCompleteBlur(e,'percentCompleteLive')}
/>%
即视为“已完成”学习
</span>
</div> </div>
<div className="video-standard-info"> <div className="video-standard-info">
<span className="icon iconfont">&#xe864;</span> <span className="icon iconfont">&#xe864;</span>
<span>视频课单个课程,用户学习进度达到<Input type="number" width="40" value={percentCompleteVideo} onChange={(e) => { this.props.onChange('percentCompleteVideo', e.target.value) }} onBlur={(e)=>this.percentCompleteBlur(e,'percentCompleteVideo')}/>%即视为“已完成”学习</span> <span>视频课单个课程,用户学习进度达到
<Input width="40"
value={percentCompleteVideo}
onChange={(e) => { this.props.onChange('percentCompleteVideo', e.target.value.replace(/\D/g,'')) }}
onBlur={(e)=>this.percentCompleteBlur(e,'percentCompleteVideo')}/>
%即视为“已完成”学习
</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:46:46 * @Date: 2021-02-20 16:46:46
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-08 16:55:56 * @LastEditTime: 2021-03-10 11:20:42
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -56,7 +56,7 @@ function PlanList(props) { ...@@ -56,7 +56,7 @@ function PlanList(props) {
dataIndex: "status", dataIndex: "status",
render: (val, item, index) => { render: (val, item, index) => {
return ( return (
<Switch defaultChecked={item.enableState==="NO"? false:true} onChange={()=>changeEnableState(item)} disabled={(userRole === "CloudManager" || userRole === "StoreManager")?false:true}/> <Switch checked={item.enableState==="NO"?false:true} onChange={()=>changeEnableState(item)} disabled={(userRole === "CloudManager" || userRole === "StoreManager")?false:true}/>
) )
}, },
}, },
...@@ -116,9 +116,12 @@ function PlanList(props) { ...@@ -116,9 +116,12 @@ function PlanList(props) {
return ( return (
<div className="operate"> <div className="operate">
<div className="operate__item" onClick={()=>toLearningDataPage(record)}>学习数据</div> <div className="operate__item" onClick={()=>toLearningDataPage(record)}>学习数据</div>
<span className="operate__item split"> | </span> {record.enableState==="YES" &&
<div className="operate__item" onClick={() => {handleShowShareModal(record); }}>分享</div> <>
<span className="operate__item split"> | </span>
<div className="operate__item" onClick={() => {handleShowShareModal(record); }}>分享</div>
</>
}
{(userRole === "CloudManager" || userRole === "StoreManager") && {(userRole === "CloudManager" || userRole === "StoreManager") &&
<> <>
<span className="operate__item split"> | </span> <span className="operate__item split"> | </span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment