From f0ea3a53c4e9372df78f43867549759cc935df8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 30 Sep 2021 16:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=B6=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/components/itemListMyTask/index.jsx         | 12 ++++++------
 src/military/task/components/itemListTask/index.jsx  |  2 +-
 src/military/task/taskDetail/index.jsx               |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

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)) && <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>
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 ? <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>
                     }
 
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 ? <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]);