From ccbe1710b9c52b0ca23150b0a9ca763da6e1223c Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 15:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master

---
 gz-customerSystem/src/views/register/visit/preview.jsx |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index e5ba619..4d96783 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -2,7 +2,7 @@
  * @Author: dminyi 1301963064@qq.com
  * @Date: 2024-08-13 15:19:57
  * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-04 15:00:02
+ * @LastEditTime: 2024-09-12 11:42:43
  * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx
  * @Description: 预览信息
  */
@@ -161,7 +161,7 @@
         </Col>
         <Col span={8}>
           <div ><div className="title-text">事项来源</div></div>
-          <div>大厅来访</div>
+          <div>{props.data?.canalName}</div>
         </Col>
         <Col span={16}>
           <div ><div className="title-text">来访形式</div></div>
@@ -201,9 +201,9 @@
           </tr>
           <tr>
             <th bgcolor="#F7F8FA" className="table-title" width="120">受理时间</th>
-            <td width='380'>{props.transactResult?.acceptTime || '-'}</td>
+            <td width='380'>{$$.minuteFormat(props.transactResult?.acceptTime) || '-'}</td>
             <th bgcolor="#F7F8FA" className="table-title" width="120">办结时间</th>
-            <td width='380'>{props.transactResult?.closeTime || '-'}</td>
+            <td width='380'>{$$.minuteFormat(props.transactResult?.closeTime) || '-'}</td>
           </tr>
           <tr>
             <th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
@@ -235,9 +235,7 @@
           <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>事件材料</h4>
         </Space>
       </Col>
-      <div style={{ marginBottom: '65px' }}>
-        <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
-      </div>
+      <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
     </div>
   )
 }

--
Gitblit v1.8.0