From 6f5f11a93fc056b0fe77f91522245cc45a1fb4fa Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 04 Sep 2024 19:19:13 +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 | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 7f00626..d40b3fc 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -40,19 +40,16 @@
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [scanFile, setScanFile] = useState(false);
- const [scanImage, setScanImage] = useState(false);
- const [scaned, setScaned] = useState(false);
const [upload, setUpLoad] = useState(false);
const [sourceType, setSourceType] = useState('1');
const [filesCheck, setFilesCheck] = useState(false);
- const [fileView, setFileView] = useState();
- const [fileTip, setFileTip] = useState('0');
const [mapView, setMapView] = useState(false);
const [visible, setVisible] = useState(false);
const [apply, setApply] = useState(false);
const [editData, setEditData] = useState(null);
const [agentVisible, setAgentVisible] = useState(false);
const [fileLength, setFileLength] = useState('');
+ const [matterNumber, setMatterNumber] = useState('');
const peopleMap = {
'15_020008-1': '申请方',
'15_020008-2': '被申请方',
@@ -112,18 +109,17 @@
<Col span={24}>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00014-1`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-101`,
}}
field='file'
handleChangeFile={handleChangeFile}
- label='身份证明材料'
+ label=''
editData={props.editData}
handleDelFile={handleDelFile}
- onFileListChange={(v) => setFileLength(v)}
- fileTip
+ onFileListChange={(v) => { setFileLength(v); console.log(v, 'vvsetFileLength') }}
/>
- {fileLength && <div style={{ position: 'absolute', top: '233px', left: '16px', color: '#86909C' }} > 申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength}</span></div>}
- </Col >
+ {fileLength.length > 0 && <div style={{ position: 'absolute',top:'198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength.length}</span></div>}
+ </Col>
</>
)
}
@@ -134,11 +130,11 @@
<Col span={24}>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00014-2`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-102`,
}}
- field='file'
+ field='file1'
handleChangeFile={handleChangeFile}
- label='身份证明材料'
+ label=''
editData={props.editData}
handleDelFile={handleDelFile}
/>
@@ -218,7 +214,8 @@
width: 180,
render: (text) => (
<>
- {text}份
+ {text}
+ {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
</>
)
@@ -328,9 +325,12 @@
setEditData(value)
}
+ // console.log(sourceType, 'sourceType')
+ // console.log(props.formRef?.current?.getFields(),'formRef.current.getFields()')
+
return (
- <div className='dataSync-page' style={{ ...props.style }}>
+ <div className='dataSync-page' style={{ ...props.style, marginTop: '8px' }}>
<Col span={24} style={{ display: 'flex', alignItems: 'center' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px', }}></div><h4>当事人信息</h4>
@@ -615,11 +615,11 @@
<Row gutter={[32, 0]}>{formType(sourceType)}</Row>
</Form>
</Col>
- <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }}>上传完成</Button>
+ <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength.length); setUpLoad(false) }}>上传完成</Button>
</Row>
</div>
- </Modal>
+ </Modal >
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
{/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */}
<div style={{ marginTop: '-16px' }}>
@@ -701,7 +701,7 @@
visible={apply}
onClose={() => setApply(false)}
/>
- </div>
+ </div >
)
}
--
Gitblit v1.8.0