From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index c7e9a88..d40b3fc 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -109,16 +109,16 @@
<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); console.log(v, 'vvsetFileLength') }}
/>
- {fileLength.length > 0 && <div style={{ position: 'absolute', top: '233px', 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>
</>
)
@@ -130,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='file1'
handleChangeFile={handleChangeFile}
- label='身份证明材料'
+ label=''
editData={props.editData}
handleDelFile={handleDelFile}
/>
@@ -325,7 +325,8 @@
setEditData(value)
}
- console.log(sourceType, 'sourceType')
+ // console.log(sourceType, 'sourceType')
+ // console.log(props.formRef?.current?.getFields(),'formRef.current.getFields()')
return (
--
Gitblit v1.8.0