From d44e0bd425b2b99e4198afc96ba37d9888e0512e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 15 Sep 2024 20:34:57 +0800
Subject: [PATCH] fix:流转进度完善

---
 gz-customerSystem/src/components/ProgressStep/VisitStep.jsx |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
index 14e906f..44d86ea 100644
--- a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
+++ b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
@@ -2,7 +2,7 @@
  * @Author: dminyi 1301963064@qq.com
  * @Date: 2024-08-29 14:57:06
  * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-29 15:58:19
+ * @LastEditTime: 2024-09-12 11:38:05
  * @FilePath: \gzDyh\gz-customerSystem\src\components\ProgressStep\VisitStep.jsx
  * @Description: 来访登记步骤条
  */
@@ -42,6 +42,27 @@
     setProType('handleCaseFlowList')
   }, [progressData])
 
+  //详细结果的处理
+  const typeDom = (data) => {
+    //审核结果同意
+    if (data.auditResult && data.auditResult == '24_00004-1') {
+      return <span>审核结果:<span style={{ color: '#00B42A' }}>{data.auditResultName}</span></span>
+    }
+    //审核结果不同意
+    if (data.auditResult && data.auditResult == '24_00004-2') {
+      return <span>审核结果:<span style={{ color: '#FF4D4F' }}>{data.auditResultName}</span></span>
+    }
+    //化解结果成功
+    if (data.mediResult && data.mediResult == '22_00025-1') {
+      return <span>审核结果:<span style={{ color: '#00B42A' }}>{data.mediResultName}</span></span>
+    }
+    //化解结果不成功
+    if (data.mediResult && data.mediResult == '22_00025-2') {
+      return <span>审核结果:<span style={{ color: '#FF4D4F' }}>{data.mediResultName}</span></span>
+    }
+    return <span>{data.handleNotes || '-'}</span>
+  }
+
   return (
     <Fragment>
       {hasTab &&
@@ -62,16 +83,18 @@
           return (
             <div key={t + 1}>
               <div className="myStep-item">
-                {t === progressData[proType].length - 1 ? null : <div className={`${!x.handleContent ? 'myStep-item-divider' : x.fileInfoList?.length > 0 ? 'myStep-item-divider2' : "myStep-item-divider1"} ${x.status === '2' && 'myStep-item-divider-success'}`} />}
-                <div className={`myStep-item-icon1 myStep-item-${x.status === 1 ? 'noStarted1' : 'success1'}`}>
-                  <div className="myStep-item-title">{x.nodeShowName || '事件流转'}</div>
-                  <img className='myStep-item-img' src={x.status === 1 ? ledger_8 : iconMap[x.taskType]} alt="" />
+                <div>
+                  <div className={`myStep-item-icon1 myStep-item-${x.status === 1 ? 'noStarted1' : 'success1'}`}>
+                    <div className="myStep-item-title">{x.nodeShowName || '事件流转'}</div>
+                    <img className='myStep-item-img' src={x.status === 1 ? ledger_8 : iconMap[x.taskType]} alt="" />
+                  </div>
+                  {t === progressData[proType].length - 1 ? null : <div className='myStep-item-divider' />}
                 </div>
                 <div className="myStep-item-right">
-                  {t === progressData[proType].length - 1 ?
+                  {x.status === 1 ?
                     <div>
                       <div className="myStep-item-p" style={{ color: 'rgba(0,0,0,0.50)' }}>
-                        {x.processName}
+                        {x.processName || '-'}
                       </div>
                       <div className="myStep-item-p">
                         <span>{x.handleUnitName || '-'}</span>
@@ -90,13 +113,17 @@
                       }
                       <div className="myStep-item-p" style={{ color: 'rgba(0,0,0,0.50)' }}>
                         <span>操作时间:</span>
-                        <span>{$$.timeFormat(x.handleTime)}</span>
+                        <span>{$$.minuteFormat(x.handleTime)}</span>
                       </div>
                       {
                         x.handleNotes &&
                         <div className='myStep-item-p-yy' style={{ width: '200px' }}>
                           <span className='myStep-item-p-yy-l'>
-                            <span><Tooltip placement="top" title={x.handleNotes || ''}><span>{x.handleNotes || '-'}</span></Tooltip></span>
+                            <span>
+                              <Tooltip placement="top" title={x.handleNotes || ''}>
+                                {typeDom(x)}
+                              </Tooltip>
+                            </span>
                           </span>
                         </div>
                       }

--
Gitblit v1.8.0