From 6ba83a080bc188326c319a8f92e2346b0482c28e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 31 Aug 2024 15:45:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx | 52 +++++++++++++++++++++-----
gz-customerSystem/src/api/appUrl.js | 6 +-
gz-customerSystem/src/views/register/visit/component/handle.jsx | 7 +++
3 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 256f403..f8279c2 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-29 09:50:55
+ * @LastEditTime: 2024-08-31 10:29:49
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: api地址
@@ -10,11 +10,11 @@
export const debug = {
// web服务
// baseUrl: 'http://gz.hugeinfo.com.cn',
- baseUrl: 'http://39ifft.natappfree.cc',
+ baseUrl: 'http://192.168.3.108:9002',
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- fileUrl: 'http://39ifft.natappfree.cc',
+ fileUrl: 'http://192.168.3.108:9002',
// fileUrl: 'http://gz.hugeinfo.com.cn',
diff --git a/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx b/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
index c5bf869..72eeb62 100644
--- a/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
@@ -2,12 +2,12 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-27 11:31:01
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-28 14:41:24
+ * @LastEditTime: 2024-08-31 15:32:42
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\MattersInfo.jsx
* @Description: 事项详情
*/
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
import PersonCard from '@/components/personCard'
import { Row, Col, Space, Button, Switch } from 'antd';
import TableView from '@/components/TableView'
@@ -23,6 +23,13 @@
// textAlign: 'center',
// marginTop: 20,
};
+
+
+
+function getCaseInfoApi(id) {
+ return $$.ax.request({ url: 'caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+}
+
const MattersInfo = (props) => {
const [fakeData, setFakeData] = useState([{
@@ -50,6 +57,7 @@
}]);//当事人信息数据
const [upload, setUpLoad] = useState(false);
const [filesCheck, setFilesCheck] = useState(false);
+ const [infoData, setInfoData] = useState({});
const fakeColumns = [
@@ -157,6 +165,30 @@
// 更多数据...
];
+ //获取id
+ const getCaseInfo = async () => {
+ const res = await getCaseInfoApi('24083010062110001')
+ if (res.type) {
+ let data = res.data
+ setInfoData([...fakeData1, {
+ ...data,
+ // status:
+ // data.status === '1' ? '待签收' :
+ // data.status === '2' ? '待受理' :
+ // data.status === '3' ? '办理中' :
+ // data.status === '4' ? '结案审核' :
+ // data.status === '5' ? '待评价' :
+ // data.status === '6' ? '已归档' : '未知状态'
+ }])
+
+ setInfoData(res.data)
+ }
+ }
+
+ useEffect(() => {
+ getCaseInfo()
+ }, [])
+
return (
<div style={{ position: 'relative' }}>
@@ -186,32 +218,32 @@
<Row gutter={[16, 16]}>
<Col span={8}>
<div><div className="title-text">事项状态</div></div>
- <div style={{ color: '#1A6FB8' }}>待办理</div>
+ <div style={{ color: '#1A6FB8' }}>{infoData.statusName || '-'}</div>
</Col>
<Col span={16}>
<div><div className="title-text">事项编号</div></div>
- <div>GZ202408010001</div>
+ <div>{infoData.caseId || '-'}</div>
</Col>
{/*事项等级分为三级，颜色需要做判断*/}
<Col span={8}>
<div className="title"><div className="title-text">事项等级</div></div>
- <div style={{ display: 'flex' }}><div style={{ backgroundColor: '#00B42A', marginRight: '4px', borderRadius: '4px' }}><div style={{ color: '#FFFFFF', padding: '0px 6px' }}>3</div></div>级</div>
+ <div style={{ display: 'flex' }}><div style={{ backgroundColor: '#00B42A', marginRight: '4px', borderRadius: '4px' }}><div style={{ color: '#FFFFFF', padding: '0px 6px' }}>{infoData.caseLevel || '-'}</div></div>级</div>
</Col>
<Col span={8}>
<div><div className="title-text">来访时间</div></div>
- <div>2024-7-12 10:00</div>
+ <div>{infoData.visitTime || '-'}</div>
</Col>
<Col span={8}>
<div ><div className="title-text">来访人数（人）</div></div>
- <div>2</div>
+ <div>{infoData.visitPeopleNum || '-'}</div>
</Col>
<Col span={8}>
<div ><div className="title-text">纠纷类型</div></div>
- <div>市场监管/金融纠纷</div>
+ <div>{infoData.caseTypeFirstName}/{infoData.caseTypeName}</div>
</Col>
<Col span={8}>
<div ><div className="title-text">纠纷发生时间</div></div>
- <div>2024-7-11</div>
+ <div>{infoData.occurTime}</div>
</Col>
<Col span={8}>
<div ><div className="title-text">纠纷发生地点</div></div>
@@ -219,7 +251,7 @@
</Col>
<Col span={8}>
<div ><div className="title-text">问题属地</div></div>
- <div>广州市/天河区/棠下街道</div>
+ {/* <div>{queProvName}/{queCityName}/{queAreaName}/{queRoadName}</div> */}
</Col>
<Col span={8}>
<div ><div className="title-text">涉及人数（人）</div></div>
diff --git a/gz-customerSystem/src/views/register/visit/component/handle.jsx b/gz-customerSystem/src/views/register/visit/component/handle.jsx
index bcced75..a72bf56 100644
--- a/gz-customerSystem/src/views/register/visit/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/handle.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
import { Col, Space, Row, Tooltip, Button } from 'antd';
import { register, fold, down, empty, link } from '../../../../assets/images';
import { Form, Input, Tabs, Typography, Empty } from '@arco-design/web-react';
@@ -8,6 +8,7 @@
import WantUserTag from '../../../../components/WantUserTag/Handling';
import { scan } from '@/assets/images/icon'
import DocumentScanner from './FileUpLoad'
+import * as $$ from '@/utils/utility';
const InputSearch = Input.Search;
@@ -33,6 +34,8 @@
const [isModalVisible, setIsModalVisible] = useState(false);
const formRef = useRef(null);
+
+
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
@@ -139,6 +142,8 @@
+
+
return (
<>
<div className='container'>
--
Gitblit v1.8.0