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

Merge pull request '修改公告页面bug' (#280) from tongChong/forgeplus-react:hotfix_api_address into pre_dev_military

This commit is contained in:
baladiwei 2021-11-23 14:46:40 +08:00
parent d9bd0387db 6507c87bc8
commit 0f92ff94a0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/military/notice/noticeList/index.jsx
View File

@ -217,7 +217,7 @@ export default (props) => {
showTotal={total => `共 ${total} 条`} showTotal={total => `共 ${total} 条`}
/> />
</div>} */} </div>} */}
{noticeList.length > 0 ? noticeList.length === 10 && <div className="edu-txt-center mt30 mb30"> {total > 0 ? total> 10 ? <div className="edu-txt-center mt30 mb30">
<Pagination <Pagination
showQuickJumper showQuickJumper
onChange={(page) => { setCurPage(page) }} onChange={(page) => { setCurPage(page) }}
@ -225,7 +225,7 @@ export default (props) => {
total={total} total={total}
showTotal={total => `共 ${total} 条`} showTotal={total => `共 ${total} 条`}
/> />
</div> : <Nodata _html="暂无数据" />} </div> : "" : <Nodata _html="暂无数据" />}
</React.Fragment> </React.Fragment>
} }
} }

2
src/military/task/components/agreementModal/index.jsx
View File

@ -55,7 +55,7 @@ export default Form.create()(props => {
<div className="task-popup-content"> <div className="task-popup-content">
{/* paperAuditing */} {/* paperAuditing */}
{checkedItem.paperAuditing && <p className=" mb10 color-orange task_tip">审核意见：{checkedItem.paperAuditing.message}</p>} {checkedItem.paperAuditing && <p className=" mb10 color-orange task_tip">审核意见：{checkedItem.paperAuditing.message}</p>}
<a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32">协议样板.word</a> <a href="https://task.osredm.com/busiAttachments/download/121" className="icon icon-attachment font-13 color-blue" length="32">协议样板.word</a>
<Form.Item className="upload-form" label="附件上传" required={true}> <Form.Item className="upload-form" label="附件上传" required={true}>
<Upload <Upload
load={uploadFunc} load={uploadFunc}

10
src/military/task/taskEdit/index.jsx
View File

@ -197,7 +197,9 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
if (res && res.data) { if (res && res.data) {
showNotification("任务保存成功！"); showNotification("任务保存成功！");
if (!status) { if (!status) {
history.push("/task/myTask?published=false") history.push("/task/myTask?published=false");
} else if (current_user.admin) {
history.push("/task");
} else { } else {
info({ info({
title: '提示', title: '提示',
@ -305,9 +307,9 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
<div className="padding30 bor-bottom-greyE"> <div className="padding30 bor-bottom-greyE">
<p className="partTitle">任务内容<span className="color-red font-14">（*必填）</span> <p className="partTitle">任务内容<span className="color-red font-14">（*必填）</span>
<span> {/* <span>
<a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">创客任务列表_2019-07-26_20-53.xlsx</a> <a href="https://task.osredm.com/busiAttachments/download/121" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">创客任务模版.xlsx</a>
</span><span className="color-grey-9 ml5 font-12 ">点击下载示例模版</span> </span><span className="color-grey-9 ml5 font-12 ">点击下载示例模版</span> */}
</p> </p>
<div className="pl15 task-edit-content"> <div className="pl15 task-edit-content">