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

修改延期的问题

This commit is contained in:
何童崇 2021-09-30 16:08:48 +08:00
parent 51a4680481
commit f0ea3a53c4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,16 +188,16 @@ export default Form.create()((props) => {
{item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.contractStatus === 1)) && <span className="list_status s_orange ml10">待签订协议</span>}
{item.status !== 8 && item.delayTime > 0 &&<span className="list_status list-yellow">延期中</span>}
{item.status !== 8 && item.cancelStatus === 1 && item.delayTime < 0 && <span className="list_status list-yellow">手动延期中</span>}
{item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime < 0 && <span className="list_status list-yellow">系统自动延期中</span>}
{item.status !== 8 && item.delayTime < 0 &&<span className="list_status list-yellow">延期中</span>}
{item.status !== 8 && item.cancelStatus === 1 && item.delayTime > 0 && <span className="list_status list-yellow">手动延期中</span>}
{item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime > 0 && item.delayCount>0 &&<span className="list_status list-yellow">系统自动延期中</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>}
{item.status !== 8 && item.delayTime > 0 &&<span className="list_status list-yellow">延期中</span>}
{item.status !== 8 && item.cancelStatus === 1 && item.delayTime < 0 &&<span className="list_status list-yellow">手动延期中</span>}
{item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime < 0 &&<span className="list_status list-yellow">系统自动延期中</span>}
{item.status !== 8 && item.delayTime < 0 &&<span className="list_status list-yellow">延期中</span>}
{item.status !== 8 && item.cancelStatus === 1 && item.delayTime > 0 &&<span className="list_status list-yellow">手动延期中</span>}
{item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime > 0 && item.delayCount>0 && <span className="list_status list-yellow">系统自动延期中</span>}
</React.Fragment>
}
</li>

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

@ -36,7 +36,7 @@ export default (props) => {
{(item.status !== 8) && item.delayTime.indexOf('延期') > -1 ? <span className="list-yellow">延期中</span>
: <React.Fragment>
{(item.status !== 8) && item.cancelStatus === 1 && <span className="list-yellow">手动延期中</span>}
{(item.status !== 8) && item.delayed && item.cancelStatus === 0 && <span className="list-yellow">系统自动延期中</span>}
{(item.status !== 8) && item.delayed && item.cancelStatus === 0 && item.delayCount>0 && <span className="list-yellow">系统自动延期中</span>}
</React.Fragment>
}

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

@ -176,8 +176,8 @@ export default Form.create()(
{/* 因为有时只延期几秒或者几分钟时后端没有返回延期，所以这里加一个判断 */}
{detailData.status === status && days ? <p className="color-grey-6 font-12">{surplus < 0 ? ('延期' + surplusTimetext) : ('剩余' + surplusTimetext)}</p> : ''}
{detailData.status === status && detailData.cancelStatus === 1 && surplus>0 && <p className="delay-text">(手动延期)</p>}
{detailData.status === status && detailData.delayed && detailData.cancelStatus===0 && surplus>0 && <p className="delay-text">(系统自动延期)</p>}
{detailData.status === status && detailData.cancelStatus === 1 && surplus > 0 && <p className="delay-text">(手动延期)</p>}
{detailData.status === status && detailData.delayed && detailData.cancelStatus === 0 && surplus > 0 && detailData.delayCount && <p className="delay-text">(系统自动延期)</p>}
</li>
)
}, [detailData]);