From e92ddbcdc1cb990de02621bccfa62cc067afd3b9 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Mon, 09 Sep 2024 15:26:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 2bb5a4f..a0bc307 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
import NewPage from '@/components/NewPage';
import { Row, Col, Space } from 'antd';
-import { Steps, Tabs, Typography, Rate,Button } from '@arco-design/web-react';
+import { Steps, Tabs, Typography, Rate, Button } from '@arco-design/web-react';
import { apply } from '@/assets/images';
import { result } from '@/assets/images/icon';
import * as $$ from '@/utils/utility';
@@ -10,17 +10,24 @@
import { register, fold, down, empty, link } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
-
-
-
const Step = Steps.Step;
const TabPane = Tabs.TabPane;
+
+function getTransactResultApi(caseId) {
+ return $$.ax.request({ url: `caseInfoUnfold/getTransactResult?caseId=${caseId}`, type: 'get', service: 'mediate' });
+}
+
+function getByCaseIdApi(caseId) {
+ return $$.ax.request({ url: `caseEvaluate/getByCaseId?caseId=${caseId}`, type: 'get', service: 'mediate' });
+}
const FileMessage = (props) => {
const [tabsActive, setTabsActive] = useState('1');
const [current, setCurrent] = useState(7);
+ const [grade, setGrade] = useState(0);
+ const [TransactResult, setTransactResult] = useState({})
const [filesCheck, setFilesCheck] = useState(false);
const [infoData, setInfoData] = useState({});
const [tabsList, setTabList] = useState([
@@ -99,6 +106,19 @@
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
};
+
+ const getTransactResult = async () => {
+ const res = await getTransactResultApi('24083010062110001')
+ if (res.type) {
+ setTransactResult({ ...res.data, fileName: res.data.fileInfoBaseDTOList.map(item => item.trueName) })
+ }
+ }
+
+ const getByCaseId = async () => {
+ const res = await getByCaseIdApi('24083010062110001')
+ setGrade(res.data)
+ console.log(res, 'resrs')
+ }
const applyDialog = [
{
@@ -327,6 +347,11 @@
};
+ useEffect(() => {
+ getByCaseId();
+ getTransactResult();
+ }, [])
+
@@ -470,33 +495,33 @@
<table border="1" align="center" cellpadding="8" className="table" >
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">化解结果</th>
- <td width='380'>化解成功</td>
+ <td width='380'>{TransactResult.mediResultName || '-'}</td>
<th bgcolor="#F7F8FA" className="table-title" width="120">经办人</th>
- <td width='380'>李晓明</td>
+ <td width='380'>{TransactResult.mediator || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">承办部门</th>
- <td>天河区棠下街综治中心</td>
+ <td>{TransactResult.mediateUnitName || '-'}</td>
<th bgcolor="#F7F8FA" className="table-title">配合部门</th>
- <td>-</td>
+ <td>{TransactResult.applyAssistUnitName || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">受理时间</th>
<td width='380'>2024-7-1 10:00</td>
<th bgcolor="#F7F8FA" className="table-title" width="120">办结时间</th>
- <td width='380'>2024-7-15 11:45</td>
+ <td width='380'>{TransactResult?.fileTime || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
- <td width='380' colspan='3'>调解开始，我首先安抚双方情绪，确保对话在一个平和的氛围中展开。随后，我引导被申请人详细说明了他的财务困境及还款意愿，同时让银行代表理解其处境，强调长期合作的重要性。经过反复沟通，被申请人理解了自身行为给申请人带来的不便，在相关证据的出示下，被申请人同意了申请方的申请请求，双方最终达成一致，签署了调解协议。</td>
+ <td width='380' colspan='3'>{TransactResult?.windupContent || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">协议要点</th>
- <td width='380' colspan='3'>经过协商，李女士同意承担主要维修费用，但考虑到水管老化属自然磨损，张先生也表示愿意承担一小部分费用以示友好特申请结案。</td>
+ <td width='380' colspan='3'>{TransactResult?.agreeContent || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">结案意见</th>
- <td width='380' colspan='3'>考虑到事项已经得到平息，过程材料也都比较完善，现申请结案</td>
+ <td width='380' colspan='3'>{TransactResult?.windupContent || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">协议文书</th>
@@ -518,10 +543,10 @@
size="small"
rowKey="id"
bordered={true}
- style={{marginBottom:'16px'}}
+ style={{ marginBottom: '16px' }}
/>
<div className='gap'></div>
- <Col span={24} style={{marginTop:'12px'}}>
+ <Col span={24} style={{ marginTop: '12px' }}>
<div style={{ color: 'rgb(134, 144, 156)' }}>办理记录</div>
<div>
{records.map(record => (
@@ -601,7 +626,7 @@
</div>
<div className='gap'></div>
- <Col span={24} style={{ display: 'flex', alignItems: 'center', margin:'12px 0px 4px 0px'}}>
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', margin: '12px 0px 4px 0px' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>当事人评价</h4>
</Space>
@@ -611,34 +636,34 @@
<div className="title">
<div className="title-text">评价等级</div>
</div>
- <div style={{ display: 'flex' }}><Rate defaultValue={3} disabled /></div>
+ <div style={{ display: 'flex' }}><Rate value={grade?.evaluateGrade} disabled /></div>
</Col>
<Col span={8}>
<div className="title">
<div className="title-text">评价时间</div>
</div>
- <div>2024-8-1 12:00</div>
+ <div>{grade?.createTime || '-'}</div>
</Col>
<Col span={8}>
<div className="title">
<div className="title-text">评价人</div>
</div>
- <div>张梦雨</div>
+ <div>{grade?.evaluateUserName || '-'}</div>
</Col>
<Col span={12}>
<div className="title">
<div className="title-text">评语</div>
</div>
- <div>实名表扬天河区棠下街综治中心，真的很有耐心处置我提出的问题，得到满意的答复。</div>
+ <div>{grade?.evaluateContent}</div>
</Col>
</Row>
<div className='gap'></div>
- <Col span={24} style={{ display: 'flex', alignItems: 'center', margin:'12px 0px 4px 0px' }}>
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', margin: '12px 0px 4px 0px' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>登记信息</h4>
</Space>
</Col>
- <Row gutter={[16, 16]} style={{marginBottom:'90px'}}>
+ <Row gutter={[16, 16]} style={{ marginBottom: '90px' }}>
<Col span={8}>
<div className="title">
<div className="title-text">登记机构</div>
--
Gitblit v1.8.0