From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Fri, 13 Sep 2024 19:10:30 +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 | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 71e9caa..97ec229 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -26,6 +26,7 @@
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [scanFile, setScanFile] = useState(false);
+ const [ocrText, setOcrText] = useState('');
const [mapView, setMapView] = useState(false);
const [visible, setVisible] = useState(false);
@@ -57,13 +58,13 @@
fileInfoList.forEach(item => {
if (item.ownerType == '22_00018-202' || item.ownerType == '22_00018-203') {
file.push({
- name: item.fileList[0].trueName,
+ ...item.fileList[0],
uid: item.fileList[0].id,
})
}
if (item.ownerType == '22_00018-204' || item.ownerType == '22_00018-207') {
file1.push({
- name: item.fileList[0].trueName,
+ ...item.fileList[0],
uid: item.fileList[0].id,
})
}
@@ -101,7 +102,7 @@
const handleConfirm = (scanContent) => {
// 处理确认逻辑
- props.formRef.current.setFieldValue('caseDes', scanContent)
+ props.formRef.current.setFieldValue(ocrText, scanContent)
setScanFile(false);
console.log(scanContent, 'scanContent')
@@ -182,6 +183,7 @@
initialValues={{
caseLevel: 3,
visitTime: getFormattedDateTime(),
+ occurTime: getFormattedDateTime(),
majorStatus: 0,
}}//默认值
>
@@ -275,22 +277,27 @@
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='问题属地' field='myQuesAddress'>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>问题属地<div className="must">必填</div></div>)}
+ field='myQuesAddress'
+ rules={[{ message: '请选择问题属地', required: true }]}
+ >
<Cascader
placeholder='请选择'
options={$$.locationOption()}
showSearch
onChange={(value, option) => {
if (option) {
+ console.log(option)
props.formRef.current.setFieldsValue({
- queProv: option[0].value,
- queProvName: option[0].label,
- queCity: option[1].value,
- queCityName: option[1].label,
- queArea: option[2].value,
- queAreaName: option[2].label,
- queRoad: option[3] && option[3].value || '',
- queRoadName: option[3] && option[3].label || '',
+ // queProv: option[0].value,
+ // queProvName: option[0].label,
+ // queCity: option[1].value,
+ // queCityName: option[1].label,
+ queArea: option[0].value,
+ queAreaName: option[0].label,
+ queRoad: option[1] && option[1].value || '',
+ queRoadName: option[1] && option[1].label || '',
})
} else {
//清除数据
@@ -330,7 +337,7 @@
</Tooltip>
<div className="must" style={{ marginLeft: '4px' }}>必填</div>
<img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
- <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
+ <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseDes') }}>识别材料</div>
</div>
}
field='caseDes'
@@ -354,7 +361,7 @@
</Tooltip> */}
<div className="must">必填</div>
<img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
- <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
+ <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseClaim') }}>识别材料</div>
</div>
}
field='caseClaim'
@@ -384,7 +391,7 @@
</div>
</Row>
- </Form>
+ </Form >
<Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
@@ -400,8 +407,6 @@
}}
/>
</div>
-
-
<DocumentScanner
visible={scanFile}
onConfirm={handleConfirm}
--
Gitblit v1.8.0