From 3a4651056a1afb5c66c5ec65ca68a49e0212be39 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 10 Sep 2024 20:37:52 +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 |   73 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
index f1cc458..f311a3b 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 });
 }
 
 //表格数据
@@ -218,33 +218,58 @@
 
   //上传弹窗完成后的事件
   const handleUpload = () => {
+
     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 => {
-            return {
-              ...item,
-              name: item.trueName,
-              uid: item.id,
-            }
-          }),
+      if (item.ownerType == '22_00018-101') {
+        const data = fileMap['22_00018-101'];
+        if (data?.length > 0) {
+          return {
+            ...item,
+            size: data.length,
+            fileNames: data.map(item => item.trueName).join(','),
+            updateTime: $$.timeFormat(data[data.length - 1].updateTime),
+            fileInfoList: data.map(item => {
+              return {
+                ...item,
+                name: item.trueName,
+                uid: item.id,
+              }
+            }),
+          }
+        } else {
+          return item
         }
-      } else {
-        return item
+
+      }
+      if (item.ownerType == '22_00018-102') {
+        const data = fileMap['22_00018-102'] || [];
+        if (data?.length > 0) {
+          return {
+            ...item,
+            size: data.length,
+            fileNames: data.map(item => item.trueName).join(','),
+            updateTime: $$.timeFormat(data[data.length - 1].updateTime),
+            fileInfoList: data.map(item => {
+              return {
+                ...item,
+                name: item.trueName,
+                uid: item.id,
+              }
+            }),
+          }
+        } else {
+          return item
+        }
       }
     })
+
     setTableData(newList)
     setUpLoadVisible(false);
   };
 
   //根据sourceType生成组件
   const formType = (type) => {
+
     if (type === '22_00018-101') {
       //申请材料
       return (
@@ -268,9 +293,10 @@
                     return item
                   }
                 })
+
                 setFileMap({
                   ...fileMap,
-                  '22_00018-101': newList
+                  '22_00018-101': newList.filter(i => i.ownerType === '22_00018-101')
                 })
               }}
             />
@@ -304,7 +330,7 @@
                 })
                 setFileMap({
                   ...fileMap,
-                  '22_00018-102': newList
+                  '22_00018-102': newList.filter(i => i.ownerType === '22_00018-102')
                 })
               }}
             />
@@ -324,6 +350,7 @@
         const res = await deleteFileByIdApi({ ids })
         if (res.type) {
           $$.infoSuccess({ content: '删除成功!' });
+          setTableData(tableData.filter(item => !ids.includes(item.ownerType)))
         }
       },
     });
@@ -342,7 +369,6 @@
         size="small"
         rowKey="ownerType"
         bordered={true}
-        style={{ marginBottom: '65px' }}
         scroll={{ x: 1300 }}
       />
       <Modal
@@ -363,6 +389,7 @@
               return (
                 <Col span={12} key={t}>
                   <div
+                    onClick={() => { x.value !== sourceType && setSourceType(x.value) }}
                     className={`casePerfection-cardTab-tab ${x.value === sourceType && 'casePerfection-cardTab-tabActive'}`}
                   >
                     <img src={x.value === sourceType ? personIconType(x.value)?.[1] : personIconType(x.value)?.[0]} alt="" style={{ width: '40px', height: '40px' }} />
@@ -408,6 +435,6 @@
           <NewFileCheck menuList={tableData} sourceType={sourceType} />
         </div>
       </Modal>
-    </Fragment>
+    </Fragment >
   )
 }

--
Gitblit v1.8.0