From b444da33c9de750aec3724e8f1cb4efe8775b165 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 20:50:09 +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/FileTable.jsx | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
index d92d9f6..ff8ea35 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
@@ -18,11 +18,11 @@
const appUrl = $$.appUrl;
function delFile(id) {
- return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'delete', service: 'sys', data: { id } });
+ return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } });
}
function deleteFileByIdApi(data) {
- return $$.ax.request({ url: `fileInfo/deleteFileByIds`, type: 'delete', service: 'sys', data });
+ return $$.ax.request({ url: `fileInfo/deleteFileByIds`, type: 'get', service: 'sys', data });
}
//表格数据
@@ -100,7 +100,7 @@
title: '操作',
dataIndex: 'perClassName',
key: 'perClassName',
- width: props.isReview ? 60 : 125,
+ width: props.isReview ? 80 : 140,
fixed: 'right',
render: (text, record) => (
<Space size="middle">
@@ -111,8 +111,8 @@
查看
</Link>
{!props.isReview && <Link onClick={() => {
- if (record.fileInfoList && record.fileInfoList.length != 0) {
- let ids = record.fileInfoList?.map(item => item.id).join(',')
+ if (record.fileList && record.fileList.length != 0) {
+ let ids = record.fileList?.map(item => item.id).join(',')
handleDelete(ids)
} else {
$$.info({ type: 'warning', content: '还没上传关于该材料的文件！' });
@@ -121,8 +121,8 @@
删除
</Link>}
<Link onClick={() => {
- if (record.fileInfoList && record.fileInfoList.length != 0) {
- let ids = record.fileInfoList?.map(item => item.id).join(',')
+ if (record.fileList && record.fileList.length != 0) {
+ let ids = record.fileList?.map(item => item.id).join(',')
handleDownlod(ids)
} else {
$$.info({ type: 'warning', content: '还没上传关于该材料的文件！' });
@@ -131,11 +131,12 @@
下载
</Link>
{!props.isReview && <Link onClick={() => {
+ console.log(record);
setSourceType(record.ownerType)
setUpLoadVisible(true)
- setFileInfoList(record.fileInfoList)
+ setFileInfoList(record.fileList)
setTimeout(() => {
- formRef.current.setFieldValue('file', record.fileInfoList)
+ formRef.current.setFieldValue('file', record.fileList)
}, 0)
}}>
上传
@@ -151,6 +152,7 @@
]
useEffect(() => {
+ console.log(props.fileInfoList);
if (props.fileInfoList && props.fileInfoList.length != 0) {
//证明材料
const applyFile = props.fileInfoList.find(item => item.ownerType == "22_00018-101")
@@ -167,7 +169,7 @@
size: applyFile.fileList.length,
fileNames: applyFile.fileList?.map(item => item.trueName).join('，'),
updateTime: $$.timeFormat(applyFile.fileList[applyFile.fileList.length - 1].updateTime),
- fileInfoList: applyFile.fileList.map(item => {
+ fileList: applyFile.fileList.map(item => {
return {
...item,
uid: item.id,
@@ -182,7 +184,7 @@
size: evidenceFile.fileList.length,
fileNames: evidenceFile.fileList?.map(item => item.trueName).join('，'),
updateTime: $$.timeFormat(evidenceFile.fileList[evidenceFile.fileList.length - 1].updateTime),
- fileInfoList: evidenceFile.fileList.map(item => {
+ fileList: evidenceFile.fileList.map(item => {
return {
...item,
uid: item.id,
@@ -221,13 +223,12 @@
const newList = tableData.map(item => {
if (item.ownerType == sourceType) {
const data = fileMap[sourceType]
- console.log(data);
return {
...item,
size: data.length,
fileNames: data.map(item => item.trueName).join('，'),
updateTime: $$.timeFormat(data[data.length - 1].updateTime),
- fileInfoList: data.map(item => {
+ fileList: data.map(item => {
return {
...item,
name: item.trueName,
@@ -239,12 +240,17 @@
return item
}
})
+ //回传文件数据的时候使用
+ if(props.handleSaveList) {
+ props.handleSaveList(newList)
+ }
setTableData(newList)
setUpLoadVisible(false);
};
//根据sourceType生成组件
const formType = (type) => {
+
if (type === '22_00018-101') {
//申请材料
return (
@@ -268,9 +274,10 @@
return item
}
})
+
setFileMap({
...fileMap,
- '22_00018-101': newList
+ '22_00018-101': newList.filter(i => i.ownerType === '22_00018-101')
})
}}
/>
@@ -304,7 +311,7 @@
})
setFileMap({
...fileMap,
- '22_00018-102': newList
+ '22_00018-102': newList.filter(i => i.ownerType === '22_00018-102')
})
}}
/>
@@ -324,6 +331,7 @@
const res = await deleteFileByIdApi({ ids })
if (res.type) {
$$.infoSuccess({ content: '删除成功！' });
+ setTableData(tableData.filter(item => !ids.includes(item.ownerType)))
}
},
});
@@ -343,6 +351,7 @@
rowKey="ownerType"
bordered={true}
scroll={{ x: 1300 }}
+ tableHeight={137}
/>
<Modal
style={{ width: '512px' }}
@@ -408,6 +417,6 @@
<NewFileCheck menuList={tableData} sourceType={sourceType} />
</div>
</Modal>
- </Fragment>
+ </Fragment >
)
}
--
Gitblit v1.8.0