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/matterDetail/FileUpLoad.jsx | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index 5f48ce3..ec1a057 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
@@ -30,11 +30,28 @@
...currentFile,
url: URL.createObjectURL(currentFile.originFile),
});
-
setScanContent(fileView.response.data.ocrResult.wordsResult[0])
+
+
};
+ const handleScaned = () => {
+ setScaned(true)
+ formRef.current.setFieldValue('scanContent', scanContent)
+
+ }
+
+ const handleText = () => {
+ onConfirm(scanContent);
+ setScanFile(false);
+ setScanImage(false);
+ setScaned(false);
+
+ }
+
+
console.log(fileView, 'fileView')
+ console.log(scanContent, 'scanContent')
return (
<>
@@ -97,7 +114,7 @@
objectFit: 'contain',
}}
/>
- <div><Button type="primary" onClick={() => setScaned(true)} style={{ marginTop: '20px' }}>开始识别</Button></div>
+ <div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
</Modal>
<Modal style={{ width: '1200px' }} visible={scaned} onCancel={() => setScaned(false)} footer={null} title='识别上传材料' centered>
<Form
@@ -106,7 +123,6 @@
requiredSymbol={false}
scrollToFirstError={true}
initialValues={{
- scanContent: scanContent,
}}//默认值
>
<FormItem
@@ -117,11 +133,10 @@
showWordLimit
rows={5}
placeholder=''
- defaultValue={scanContent}
wrapperStyle={{ width: '100%' }}
onChange={(v) => console.log(v, 'vvvvvv')}
/>
- <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { onConfirm(); setScanFile(false); setScanImage(false); setScaned(false); }}>使用文字</Button></div>
+ <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { handleText() }}>使用文字</Button></div>
</FormItem>
</Form>
--
Gitblit v1.8.0