From d2280c384e4b8f6acef1e01f400e3c61c97d82d9 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Sat, 07 Sep 2024 16:56:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 160 ++++++++++++++++++++++++++++-------------------------
1 files changed, 84 insertions(+), 76 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index ce4f64f..0d9db5b 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -29,12 +29,16 @@
const InputSearch = Input.Search;
const appUrl = $$.appUrl;
-function delFile(id) {
- return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } });
+function delFile(ids) {
+ return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'delete', service: 'sys', data: { ids } });
}
function listIdTypeInfoApi(data) {
return $$.ax.request({ url: `fileInfo/listIdTypeInfo`, type: 'post', service: 'sys', data });
+}
+
+function deleteFileByIdApi(data) {
+ return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'delete', service: 'sys', data });
}
const VisitorRegister = (props) => {
@@ -57,6 +61,32 @@
const [evidenceNumber, setEvidenceNumber] = useState('');
const [applyFile, setApplyFile] = useState([]);
const [evidenceFile, setEvidenceFile] = useState([]);
+ const [fakeData1, setFakeData1] = useState([
+ {
+ ownerTyp: "22_00018-101",
+ ownerTypeName: "申请材料",
+ size: '0',
+ ownerId: null,
+ ownerName: null,
+ perType: null,
+ agentStatus: null,
+ fileNames: "-",
+ fileList: []
+ },
+ {
+ ownerType: "22_00018-102",
+ ownerTypeName: "证据材料",
+ size: '0',
+ ownerId: null,
+ ownerName: null,
+ perType: null,
+ agentStatus: null,
+ fileNames: "-",
+ fileList: []
+ },
+
+ ]);
+
const peopleMap = {
'15_020008-1': '申请方',
'15_020008-2': '被申请方',
@@ -106,17 +136,33 @@
}
}
-
- const listIdTypeInfo = async () => {
- const res = await listIdTypeInfoApi({
- mainId: "2409061125411006", //事项ID
- ownerIdList: ["2409061125411006"], //具体所属编号
- })
+ //批量删除文件
+ const deleteFileById = async (data) => {
+ const res = await deleteFileByIdApi(data)
if (res.type) {
- console.log(res,'resres')
+ $$.infoSuccess({ content: '删除成功！' });
}
}
+
+
+
+ const listIdTypeInfo = async () => {
+ const res = await listIdTypeInfoApi({
+ mainId: props.mainId, //事项ID
+ ownerIdList: [props.mainId], //具体所属编号
+ typeList: []
+ })
+ if (res.type) {
+ let data = res.data?.[0]?.fileList
+ if (res.data.length > 0) {
+ setFakeData1(data)
+ }
+ }
+ }
+
+ console.log(fakeData1,'fakeData1')
+
@@ -131,7 +177,6 @@
action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-101`,
}}
field='file'
- handleChangeFile={handleChangeFile}
label=''
editData={props.editData}
handleDelFile={handleDelFile}
@@ -152,66 +197,19 @@
action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-102`,
}}
field='file1'
- handleChangeFile={handleChangeFile1}
label=''
editData={props.editData}
handleDelFile={handleDelFile}
onFileListChange={(v) => { SetEvidenceLength(v); console.log(v, 'vvsetFileLength') }}
/>
- {evidenceLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{evidenceLength?.length}</span></div>}
+ {evidenceLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>证据材料累计上传：<span style={{ color: '#1A6FB8' }}>{evidenceLength?.length}</span></div>}
</Col>
</>
)
}
}
- const fakeData1 = [
- {
- id: 1,
- caseNo: 'A20230101',
- judicNo: '申请材料',
- perClassName: '李晓明的纠纷化解申请表、身份证...',
- inputUserName: '0',
- mediateUserName: '2024-7-12 12:00',
- judgeName: '王五',
- mediator: '赵六',
- handlerUserName: '钱七',
- returnUserName: '孙八',
- expireTime: '2023-08-10T08:00:00.000Z',
- processName: '进行中',
- otherMediator: '周九',
- canalName: '网络',
- judicResult: '通过',
- assistName: '吴十',
- mediTypeName: '民事调解',
- serieStatus: '1', // 1 表示非系列案，2 表示系列案
- // 更多字段...
- },
- {
- id: 2,
- caseNo: 'A20230101',
- judicNo: '证据材料',
- perClassName: '李晓明的纠纷化解申请表、身份证...',
- inputUserName: '0',
- mediateUserName: '2024-7-12 12:00',
- judgeName: '王五',
- mediator: '赵六',
- handlerUserName: '钱七',
- returnUserName: '孙八',
- expireTime: '2023-08-10T08:00:00.000Z',
- processName: '进行中',
- otherMediator: '周九',
- canalName: '网络',
- judicResult: '通过',
- assistName: '吴十',
- mediTypeName: '民事调解',
- serieStatus: '1', // 1 表示非系列案，2 表示系列案
- // 更多字段...
- },
-
- // 更多数据...
- ];
// 列配置
const fakeColumns = [
@@ -224,36 +222,30 @@
},
{
title: '材料类型',
- dataIndex: 'judicNo',
- key: 'judicNo',
+ dataIndex: 'ownerTypeName',
+ key: 'ownerTypeName',
width: 60,
},
{
title: '材料数量',
- dataIndex: 'inputUserName',
- key: 'perClassName',
+ dataIndex: 'size',
+ key: 'size',
width: 180,
- render: (text, index) => (
- <div onClick={() => console.log(text, index)}>
- 1
- {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
- </div>
- )
-
+ render: (text) => <span>{text}份</span>,
},
{
title: '材料名称',
- dataIndex: 'perClassName',
- key: 'perClassName',
+ dataIndex: 'fileNames',
+ key: 'fileNames',
width: 180,
},
{
title: '最新上传时间',
- dataIndex: 'mediateUserName',
- key: 'mediateUserName',
+ dataIndex: 'fileNames',
+ key: 'fileNames',
width: 180,
},
@@ -304,6 +296,11 @@
};
+ const handleUpload = () => {
+ listIdTypeInfo()
+ setUpLoad(false);
+ };
+
const handleCancel = () => {
// 处理取消逻辑
setScanFile(false);
@@ -350,10 +347,21 @@
setEditData(value)
}
+
+
+
+
+ const uploadQuery = {
+ mainId: props.mainId,
+ ownerCat: null,
+ createStart: null,
+ createEnd: null,
+ uploaderType: null
+ }
+
// console.log(sourceType, 'sourceType')
// console.log(props.formRef?.current?.getFields(),'formRef.current.getFields()')
useEffect(() => {
- listIdTypeInfo()
}, [])
return (
@@ -597,7 +605,7 @@
columns={fakeColumns}
dataSource={fakeData1}
size="small"
- rowKey="id"
+ rowKey="ownerType"
bordered={true}
style={{ marginBottom: '65px' }}
/>
@@ -642,7 +650,7 @@
<Row gutter={[32, 0]}>{formType(sourceType)}</Row>
</Form>
</Col>
- <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength?.length); setEvidenceNumber(evidenceLength?.length); setUpLoad(false) }}>上传完成</Button>
+ <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => handleUpload()}>上传完成</Button>
</Row>
</div>
--
Gitblit v1.8.0