From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/matterDetail/index.jsx | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 4767604..8690c0f 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -16,29 +16,7 @@
export default function MatterDetail(props) {
- const [fakeData, setFakeData] = useState([{
- "trueName": "王大锤",
- "mobile": "13380313412",
- "certiType": "09_00015-1",
- "certiTypeName": "身份证",
- "certiNo": "440981199902025123",
- "perType": "15_020008-1",
- "perClass": "09_01001-1",
- "perTypeName": "申请方当事人",
- "perClassName": "自然人",
- "id": "24083010053310002"
- }, {
- "trueName": "刘俊峰",
- "mobile": "13380313412",
- "certiType": "09_00015-1",
- "certiTypeName": "身份证",
- "certiNo": "440981199902023234",
- "perType": "15_020008-2",
- "perClass": "09_01001-1",
- "perTypeName": "被申请方当事人",
- "perClassName": "自然人",
- "id": "24083010054710003"
- }]);//当事人信息数据
+ const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [upload, setUpLoad] = useState(false);
const [filesCheck, setFilesCheck] = useState(false);
const [infoData, setInfoData] = useState({});
@@ -150,12 +128,38 @@
if (res.type) {
let data = res.data
+ const partyList = data.personList.concat(data.agentList)
setInfoData({
...data,
questionName: data.queProvName === null ? '-' : data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName + '/' + data.queVillageName,
caseType: data.caseTypeFirstName === null ? '-' : data.caseTypeFirstName + '/' + data.caseTypeName
})
- setFakeData(data.personList.concat(data.agentList))
+ setFakeData(partyList.map(item => {
+ const fileInfoList = item.fileInfoList
+ let file = [];//身份证明材料、企业登记材料
+ let file1 = [];//法人、机构身份证明材料、代理人授权委托书
+ if (fileInfoList && fileInfoList.length != 0) {
+ fileInfoList.forEach(item => {
+ if (item.ownerType == '22_00018-202' || item.ownerType == '22_00018-203') {
+ file.push({
+ name: item.fileList[0].trueName,
+ uid: item.fileList[0].id,
+ })
+ }
+ if (item.ownerType == '22_00018-204' || item.ownerType == '22_00018-207') {
+ file1.push({
+ name: item.fileList[0].trueName,
+ uid: item.fileList[0].id,
+ })
+ }
+ })
+ }
+ return {
+ ...item,
+ file,
+ file1
+ }
+ }))
}
}
--
Gitblit v1.8.0