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

上传issue修改

This commit is contained in:
何童崇 2021-08-05 17:46:48 +08:00
parent f5fa216b23
commit f25a52622d
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/military/task/components/itemListMyTask/index.jsx
View File

@ -187,10 +187,10 @@ export default Form.create()((props) => {
{
joinTask ? <React.Fragment>
{item.myPaperStatus === 0 && <span className="list_status s_orange ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
{item.myPaperStatus === 1 && <span className="list_status ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
{item.myPaperStatus === 1 && <span className="list_status s_grey ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
{item.myPaperStatus === 2 && <span className="list_status s_red ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
{item.status === 6 && <span className="list_status s_orange ml10">待签订协议</span>}
{item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.contractStatus === 1)) &&<span className="list_status s_orange ml10">待签订协议</span>}
</React.Fragment> : <React.Fragment>
{item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.auditing && item.auditing.pass === 1)) && <span className="list_status s_orange ml10">待签订协议</span>}
</React.Fragment>

4
src/military/task/components/itemListMyTask/index.scss
View File

@ -60,6 +60,10 @@
background: #4cacff;
}
.s_grey {
background: #bababa;
}
.needs_condition_content_t {
height: 40px;
padding: 0px 20px;

5
src/military/task/taskDetail/index.jsx
View File

@ -164,12 +164,11 @@ export default Form.create()(
surplusTimetext = formatDuring(surplus);
}
return (
<li key={title} className={classNames({ active: (detailData.status !== 9 && detailData.status >= status && (![4, 5, 6, 7].includes(status) || ([4, 5, 6, 7].includes(status) && (!detailData.exceptClosedBoolean)))) })} >
// && (![4, 5, 6, 7].includes(status) || ([4, 5, 6, 7].includes(status) && (!detailData.exceptClosedBoolean)))
<li key={title} className={classNames({ active: (detailData.currentStatus !== 9 && detailData.currentStatus >= status) || (status === 8 && detailData.exceptClosedBoolean) })} >
<span>{title}</span>
{detailData.status !== status && days && <p className="color-grey-6 font-12">{days}天</p>}
{/* {detailData.status === status && detailData.status !== 8 && detailData.delayTime && <p className="color-grey-6 font-12">{detailData.delayTime}</p>} */}
{/* 因为有时只延期几秒或者几分钟时后端没有返回延期，所以这里加一个判断 */}
{detailData.status === status && days && <p className="color-grey-6 font-12">{surplus < 0 ? ('延期' + surplusTimetext) : ('剩余' + surplusTimetext)}</p>}
</li>

3
src/modules/tpm/NewHeader.js
View File

@ -840,6 +840,9 @@ class NewHeader extends Component {
<li>
<Link to={`/users/${this.props.current_user.login}`}>个人中心</Link>
</li>
<li>
<Link to={`/task/myTask`}>创客管理</Link>
</li>
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses &&
<li><a href={`${mygetHelmetapi2.new_course.my_courses}`} target="_blank">我的课程</a></li>