From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 4c41c45..99aec0e 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -49,7 +49,11 @@
const [editData, setEditData] = useState(null);
const [agentVisible, setAgentVisible] = useState(false);
const [fileLength, setFileLength] = useState('');
+ const [evidenceLength, SetEvidenceLength] = useState(null);
const [matterNumber, setMatterNumber] = useState('');
+ const [evidenceNumber, setEvidenceNumber] = useState('');
+ const [applyFile, setApplyFile] = useState([]);
+ const [evidenceFile, setEvidenceFile] = useState([]);
const peopleMap = {
'15_020008-1': '申请方',
'15_020008-2': '被申请方',
@@ -81,16 +85,15 @@
const handleChangeFile = (data) => {
console.log(data, 'handleChangeFile')
- if (data.data && data.data.length != 0) {
- if (data.data[0].idcardOcrResult) {
- const { birthday, ...rest } = data.data[0].idcardOcrResult
- //回填信息
- formRef.current.setFieldsValue({
- ...rest
- })
- }
- }
+ setApplyFile(data)
+
}
+
+ const handleChangeFile1 = (data) => {
+ console.log(data, 'handleChangeFile1')
+ setEvidenceFile(data)
+ }
+
//删除文件
const handleDelFile = async (id) => {
@@ -118,7 +121,7 @@
handleDelFile={handleDelFile}
onFileListChange={(v) => { setFileLength(v); console.log(v, 'vvsetFileLength') }}
/>
- {fileLength.length > 0 && <div style={{ position: 'absolute',top:'198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength.length}</span></div>}
+ {fileLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength?.length}</span></div>}
</Col>
</>
)
@@ -133,11 +136,14 @@
action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-102`,
}}
field='file1'
- handleChangeFile={handleChangeFile}
+ 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>}
</Col>
</>
)
@@ -212,11 +218,11 @@
dataIndex: 'inputUserName',
key: 'perClassName',
width: 180,
- render: (text) => (
- <>
- {text}
+ render: (text,index) => (
+ <div onClick={() => console.log(text,index)}>
+ 1
{/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
- </>
+ </div>
)
@@ -615,7 +621,7 @@
<Row gutter={[32, 0]}>{formType(sourceType)}</Row>
</Form>
</Col>
- <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength.length); setUpLoad(false) }}>上传完成</Button>
+ <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength?.length); setEvidenceNumber(evidenceLength?.length); setUpLoad(false) }}>上传完成</Button>
</Row>
</div>
--
Gitblit v1.8.0