From 3c3ac0c2c225f763fffb05ad669d76b50b4f6e45 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 06 Sep 2024 16:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

---
 gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 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..e7d6957 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -20,7 +20,7 @@
 import MapView from './map';
 import { scan } from '@/assets/images/icon';
 import { EventLevelDrawer, MattersDetail } from './levelDetail';
-import DocumentScanner from '../../handleFeedback/component/FileUpLoad';
+import DocumentScanner from '../../matterDetail/FileUpLoad';
 import ArcoUpload from '@/components/ArcoUpload';
 
 
@@ -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) => {
@@ -109,16 +112,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,14 +133,17 @@
           <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='身份证明材料'
+              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>
       )
 
 
@@ -274,9 +280,12 @@
     setDialogType(type)
   }
 
-  const handleConfirm = () => {
+  const handleConfirm = (scanContent) => {
     // 处理确认逻辑
+    props.formRef.current.setFieldValue('caseDes', scanContent)
     setScanFile(false);
+    console.log(scanContent,'scanContent')
+
   };
 
   const handleCancel = () => {
@@ -325,7 +334,8 @@
     setEditData(value)
   }
 
-  console.log(sourceType, 'sourceType')
+  // console.log(sourceType, 'sourceType')
+  // console.log(props.formRef?.current?.getFields(),'formRef.current.getFields()')
 
 
   return (
@@ -614,7 +624,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