diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx index 5ece8d4c..41dd69df 100644 --- a/src/military/task/components/itemListMyTask/index.jsx +++ b/src/military/task/components/itemListMyTask/index.jsx @@ -188,16 +188,16 @@ export default Form.create()((props) => { {item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.contractStatus === 1)) && 待签订协议} - {item.status !== 8 && item.delayTime > 0 &&延期中} - {item.status !== 8 && item.cancelStatus === 1 && item.delayTime < 0 && 手动延期中} - {item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime < 0 && 系统自动延期中} + {item.status !== 8 && item.delayTime < 0 &&延期中} + {item.status !== 8 && item.cancelStatus === 1 && item.delayTime > 0 && 手动延期中} + {item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime > 0 && item.delayCount>0 &&系统自动延期中} : {item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.auditing && item.auditing.pass === 1)) && 待签订协议} - {item.status !== 8 && item.delayTime > 0 &&延期中} - {item.status !== 8 && item.cancelStatus === 1 && item.delayTime < 0 &&手动延期中} - {item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime < 0 &&系统自动延期中} + {item.status !== 8 && item.delayTime < 0 &&延期中} + {item.status !== 8 && item.cancelStatus === 1 && item.delayTime > 0 &&手动延期中} + {item.status !== 8 && item.delayed && item.cancelStatus === 0 && item.delayTime > 0 && item.delayCount>0 && 系统自动延期中} } diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx index 8afe4554..8f6ac65e 100644 --- a/src/military/task/components/itemListTask/index.jsx +++ b/src/military/task/components/itemListTask/index.jsx @@ -36,7 +36,7 @@ export default (props) => { {(item.status !== 8) && item.delayTime.indexOf('延期') > -1 ? 延期中 : {(item.status !== 8) && item.cancelStatus === 1 && 手动延期中} - {(item.status !== 8) && item.delayed && item.cancelStatus === 0 && 系统自动延期中} + {(item.status !== 8) && item.delayed && item.cancelStatus === 0 && item.delayCount>0 && 系统自动延期中} } diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 8429fd43..81296eee 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -176,8 +176,8 @@ export default Form.create()( {/* 因为有时只延期几秒或者几分钟时后端没有返回延期,所以这里加一个判断 */} {detailData.status === status && days ?

{surplus < 0 ? ('延期' + surplusTimetext) : ('剩余' + surplusTimetext)}

: ''} - {detailData.status === status && detailData.cancelStatus === 1 && surplus>0 &&

(手动延期)

} - {detailData.status === status && detailData.delayed && detailData.cancelStatus===0 && surplus>0 &&

(系统自动延期)

} + {detailData.status === status && detailData.cancelStatus === 1 && surplus > 0 &&

(手动延期)

} + {detailData.status === status && detailData.delayed && detailData.cancelStatus === 0 && surplus > 0 && detailData.delayCount &&

(系统自动延期)

} ) }, [detailData]);