junru0303
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'expert_review' of https://code.gitlink.org.cn/durian/forgeplus-react into dev_military_osredm

This commit is contained in:
何童崇 2022-01-13 17:45:17 +08:00
parent 7c17dcb638 d30787dde5
commit cce463ed43
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/military/expert/reviewResult/index.jsx
View File

@ -16,7 +16,7 @@ function ReviewResult({ history, match }) {
const [openResultVisible, setOpenResultVisible] = useState(false); const [openResultVisible, setOpenResultVisible] = useState(false);
const [winIds, setWinIds] = useState(undefined); const [winIds, setWinIds] = useState(undefined);
const [openRange, setOpenRange] = useState(undefined); const [openRange, setOpenRange] = useState(undefined);
const [errorMessage,setErrorMessage] = useState("若未填写此排名，则公示所有名次"); const [errorMessage,setErrorMessage] = useState();
const [result, setResult] = useState(undefined); const [result, setResult] = useState(undefined);
// 模态框 // 模态框
@ -107,9 +107,10 @@ function ReviewResult({ history, match }) {
} }
function onOk(){ function onOk(){
setErrorMessage("若未填写此排名，则公示所有名次"); setErrorMessage("");
let ids = [];
if(!openRange){ if(!openRange){
setOpenRange(dataList.length+''); dataList.map(i=> {ids[ids.length] = i.applicantInfo.id;});
}else if(openRange && isNaN(openRange)){ }else if(openRange && isNaN(openRange)){
setErrorMessage('请输入数字!'); setErrorMessage('请输入数字!');
}else if(openRange && (openRange.indexOf('.')!==-1 || openRange.indexOf('-')!==-1)){ }else if(openRange && (openRange.indexOf('.')!==-1 || openRange.indexOf('-')!==-1)){
@ -117,23 +118,22 @@ function ReviewResult({ history, match }) {
}else if(openRange && openRange > dataList.length){ }else if(openRange && openRange > dataList.length){
setErrorMessage('公示范围超过应征者总数!'); setErrorMessage('公示范围超过应征者总数!');
}else{ }else{
const ids = [];
ids[ids.length] = dataList.filter(item=>item.id<=openRange).map(i=>i.applicantInfo.id); ids[ids.length] = dataList.filter(item=>item.id<=openRange).map(i=>i.applicantInfo.id);
}
let params = { let params = {
containerId : taskId, containerId : taskId,
containerType: 1, containerType: 1,
id: 0, id: 0,
publicityUserIds : dataList.filter(item=>item.id<=openRange).map(i=>i.applicantInfo.id).toString(), publicityUserIds : ids.toString(),
winUserIds:winIds.toString() winUserIds:winIds.toString()
}; };
selectWinnersAndPublicists(params).then(response=>{ ids.length!=0 && selectWinnersAndPublicists(params).then(response=>{
if(response && response.message === "success"){ if(response && response.message === "success"){
message.success("操作成功"); message.success("操作成功");
setOpenResultVisible(false); setOpenResultVisible(false);
} }
}) })
} }
}
return ( return (
<div className="expert_review_system centerbox"> <div className="expert_review_system centerbox">
@ -168,7 +168,7 @@ function ReviewResult({ history, match }) {
<Input placeholder="请输入" onChange={(e)=>{setOpenRange(e.target.value)}}/> <Input placeholder="请输入" onChange={(e)=>{setOpenRange(e.target.value)}}/>
名 名
</div> </div>
<p className="mt5">{errorMessage}</p> <p className={`mt5 ${errorMessage && 'errorMes'}`}>{errorMessage || "若未填写此排名，则公示所有名次"}</p>
</Modal> </Modal>
<GradesModal <GradesModal

3
src/military/expert/reviewResult/index.scss
View File

@ -58,4 +58,7 @@
.ant-modal-title { .ant-modal-title {
text-align: left; text-align: left;
} }
.errorMes{
color: #d40000;
}
} }