From 57d1fbef468c74a6c57a7f2e48de082707dbdff0 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Fri, 13 Sep 2024 11:27:26 +0800
Subject: [PATCH] 办理反馈页面修改

---
 gz-customerSystem/src/views/register/index.less                    |    6 ++
 gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx |   59 +++++++++++++++----
 gz-customerSystem/src/views/register/matterDetail/personCard.jsx   |   43 ++++++++++++++
 gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx  |    2 
 gz-customerSystem/src/views/register/matterDetail/Supervising.jsx  |   12 ++--
 5 files changed, 102 insertions(+), 20 deletions(-)

diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index ef63471..17ff8d0 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -322,6 +322,10 @@
 		flex-direction: row;
 		column-gap: 8px;
 		margin: 0px 8px 0 16px;
+		max-height: 600px;
+    min-height: fit-content;
+    overflow-y: auto;
+
 
 
 		&-left {
@@ -393,6 +397,7 @@
 		&-right {
 			flex: 1 1 0%;
 			background-color: rgb(255, 255, 255);
+			height: fit-content;
 		}
 	}
 }
@@ -587,6 +592,7 @@
 
 		&-detail {
 			color: #1A6FB8;
+			cursor: pointer;
 		}
 	}
 
diff --git a/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx b/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
index ee460ea..f79e86f 100644
--- a/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
@@ -2,23 +2,28 @@
  * @Author: dminyi 1301963064@qq.com
  * @Date: 2024-09-06 09:40:00
  * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-12 20:55:47
+ * @LastEditTime: 2024-09-13 10:29:41
  * @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\HandleRecord.jsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @Description: 办理记录
  */
 import React, { useState, useEffect } from 'react';
 import { Empty } from '@arco-design/web-react';
-import { fold, down, empty, edit } from '@/assets/images';
+import { fold, down, empty, edit, register } from '@/assets/images';
 import { Image } from 'antd';
-import {link} from '@/assets/images';
+import { link } from '@/assets/images';
 import * as $$ from '@/utils/utility';
+import PersonCard from './personCard';
 
+function getByIdRoleApi(id) {
+  return $$.ax.request({ url: `ctUser/getByIdRole?id=` + id, type: 'get', service: 'cust' });
+}
 
 export default function HandleRecord(props) {
   const appUrl = $$.appUrl;
   const [list, setList] = useState([]);
   const [imgVisible, setImgVisible] = useState({ visible: false, src: '' });
-
+  const [personView, setPersonView] = useState(false)
+  const [personData, setPersonData] = useState({})
 
   useEffect(() => {
     setList(props.data)
@@ -35,6 +40,24 @@
       return record;
     }));
   };
+
+  const getByIdRole = async (id) => {
+    const res = await getByIdRoleApi(id)
+    if (res.type) {
+      setPersonView(!personView)
+      setPersonData(res.data)
+    }
+  }
+
+  const handlePersonDetail = (id) => {
+    getByIdRole(id)
+  }
+
+  const handleCancel=()=>{
+    setPersonView(false)
+  }
+
+
 
   const handleEdit = (id) => {
     props.handleEdit(id)
@@ -68,13 +91,16 @@
                 }
                 <div>{`${record.createTime} ${record.handleUnitName}`}</div>
                 <div className={`container-bottom-left-record-top-${record.handleType === '2' ? 'remark' : 'hostOrg'}`}>{record.handleType === '2' ? '配合部门' : '承办部门'}</div>
-                {!props.isReview && <div><img src={edit} alt='' className='container-bottom-left-record-top-edit' onClick={() => handleEdit(record)} /></div>}
+                {!props.isReview && !props.noEdit && <div><img src={edit} alt='' className='container-bottom-left-record-top-edit' onClick={() => handleEdit(record)} /></div>}
               </div>
               <div className='container-bottom-left-record-bottom' style={{ display: record.showView ? 'block' : 'none' }}>
                 <table border="1" cellpadding="8" className='container-bottom-left-record-bottom-table'>
                   <tr>
                     <th bgcolor="#F7F8FA" className="table-title" width="120">操作人</th>
-                    <td>{record.handleUserName || '-'}</td>
+                    <td>
+                      {record.handleUserName || '-'}
+                      <img src={register} alt='' onClick={() => handlePersonDetail(record.handleUserId)} style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '-4px' }} />
+                    </td>
                   </tr>
                   <tr>
                     <th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
@@ -92,11 +118,18 @@
                         }}
                       />
                     </div>
-                    <td style={{ color: '#1A6FB8' }} onClick={() => handleOpenFiles(record?.fileInfoList?.[0])}>
-                      <div style={{cursor: 'pointer',display:'flex',alignItems:'center',gap:'4px'}}>
-                        <img src={link} alt='' style={{width:'14px',height:'14px'}}/>
-                        <div>{record?.fileInfoList?.[0]?.name || '-'}</div>
-                      </div>
+                    <td>
+                      {record?.fileInfoList?.length > 0 ?
+                        <div style={{ display: 'flex', alignItems: 'center', gap: '4px', color: '#1A6FB8' }}>
+                          <img src={link} alt='' style={{ width: '14px', height: '14px' }} />
+                          <div>
+                            {record?.fileInfoList?.map((item, index) =>
+                              <div key={index} onClick={() => handleOpenFiles(item)} style={{ cursor: 'pointer' }}>{item.name || '-'}{index === record.fileInfoList.length - 1 ? '' : ','}</div>
+                            )}
+                          </div>
+                        </div> : '-'
+                      }
+
                     </td>
                   </tr>
                 </table>
@@ -120,7 +153,7 @@
           description='暂无数据'
         />
       }
-
+      <PersonCard personView={personView} handleCancel={handleCancel} personData={personData} />
     </div>
   )
 }
diff --git a/gz-customerSystem/src/views/register/matterDetail/Supervising.jsx b/gz-customerSystem/src/views/register/matterDetail/Supervising.jsx
index ab8b43b..ef4bc15 100644
--- a/gz-customerSystem/src/views/register/matterDetail/Supervising.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/Supervising.jsx
@@ -2,7 +2,7 @@
  * @Author: dminyi 1301963064@qq.com
  * @Date: 2024-09-06 09:54:09
  * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-06 11:03:29
+ * @LastEditTime: 2024-09-13 11:20:00
  * @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\Supervising.jsx
  * @Description: 督办
  */
@@ -102,7 +102,7 @@
             <div>张三丰</div>
           </div>
           <div className='Supervising-item'>
-            <div className='Supervising-item-title' style={{ width: '70px' }}>督办内容:</div>
+            <div className='Supervising-item-title' style={{ width: '80px' }}>督办内容:</div>
             <div style={{ flex: 1 }}>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div>
           </div>
           <div className='Supervising-item'>
@@ -125,8 +125,8 @@
             <div>张三丰</div>
           </div>
           <div className='Supervising-item'>
-            <div className='Supervising-item-title'>督办内容:</div>
-            <div>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div>
+            <div className='Supervising-item-title' style={{ width: '80px' }}>督办内容:</div>
+            <div style={{ flex: 1 }}>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div>
           </div>
           <div className='Supervising-item'>
             <div className='Supervising-item-title'>督办附件:</div>
@@ -161,7 +161,7 @@
             </Col>
             <Col span={24}>
               <div className="title-text">督办附件</div>
-              <img src={link} alt="" className="title-file" />广东好又多贸易有限公司营业执照副本.pdf
+              <img src={link} alt="" style={{ width: '14px', height: '14px' }} />广东好又多贸易有限公司营业执照副本.pdf
             </Col>
           </Row>
           <Col span={24} style={{ marginBottom: '8px' }}>
@@ -257,7 +257,7 @@
           <Col span={24}>
             <div className="title-text">督办附件</div>
             <div style={{ display: 'flex' }}>
-              <img src={link} alt="" className="title-file" />
+              <img src={link} alt="" style={{ width: '14px', height: '14px' }} />
               <div style={{ color: '#1A6FB8' }}>广东好又多贸易有限公司营业执照副本.pdf</div>
             </div>
 
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index b83c55b..808ebfa 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -170,7 +170,7 @@
                       <Space size='small'>
                         <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>办理记录({list.length})</h4>
                       </Space>
-                      <HandleRecord isReview={true} data={list} />
+                      <HandleRecord isReview={true} data={list} noEdit/>
                     </div>
                   }
                   {grade &&
diff --git a/gz-customerSystem/src/views/register/matterDetail/personCard.jsx b/gz-customerSystem/src/views/register/matterDetail/personCard.jsx
new file mode 100644
index 0000000..f1b1b68
--- /dev/null
+++ b/gz-customerSystem/src/views/register/matterDetail/personCard.jsx
@@ -0,0 +1,43 @@
+/*
+ * @Author: dminyi 1301963064@qq.com
+ * @Date: 2024-09-13 10:37:48
+ * @LastEditors: dminyi 1301963064@qq.com
+ * @LastEditTime: 2024-09-13 10:46:34
+ * @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\personCard.jsx
+ * @Description: 
+ */
+
+import React from 'react';
+import {  Modal } from '@arco-design/web-react';
+
+
+const PersonCard = (props) => {
+  return (
+    <>
+      <Modal visible={props.personView} onCancel={props.handleCancel} title='工作人员信息' centered footer={null}>
+        <table border="1" align="center" cellpadding="5" className="table">
+          <tr>
+            <th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th>
+            <td width='380'><div style={{ display: 'flex' }}><div>{props.personData?.trueName}</div></div></td>
+            <th bgcolor="#F7F8FA" className="table-title" width="120">登录账号</th>
+            <td width='380'>{props.personData?.acc}</td>
+          </tr>
+          <tr>
+            <th bgcolor="#F7F8FA" className="table-title">手机号码</th>
+            <td>{props.personData?.mobile}</td>
+            <th bgcolor="#F7F8FA" className="table-title">工作电话</th>
+            <td>-</td>
+          </tr>
+          <tr>
+            <th bgcolor="#F7F8FA" className="table-title">所属部门</th>
+            <td>{props.personData?.unitName}</td>
+            <th bgcolor="#F7F8FA" className="table-title">职务</th>
+            <td>{props.personData?.userRoles}</td>
+          </tr>
+        </table>
+      </Modal>
+    </>
+  )
+}
+
+export default PersonCard;

--
Gitblit v1.8.0