From 095037371c10be43d507e009b260a08e28e3e78a Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 03 Sep 2024 11:31:37 +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 | 143 ++++++++---------------------------------------
1 files changed, 25 insertions(+), 118 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 2149ce9..89134f4 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -19,15 +19,12 @@
import { IconLink } from '@arco-design/web-react/icon';
import MapView from './map'
import { scan } from '@/assets/images/icon'
-import { EventLevelDrawer, MattersDetail } from './levelDetail';
+import { EventLevelDrawer, MattersDetail } from './levelDetail'
+import DocumentScanner from '../../handleFeedback/component/FileUpLoad'
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息
const FormItem = Form.Item;
const InputSearch = Input.Search;
-
-function getId() {
- return $$.ax.request({ url: `caseUtils/getNewTimeId`, type: 'get', service: 'utils' });
-}
const VisitorRegister = (props) => {
@@ -259,44 +256,6 @@
// 更多列配置...
];
- const options1 = [
- {
- value: 'jingjijiufen',
- label: '经济纠纷',
- children: [
- {
- value: 'laodongjiufen',
- label: '劳动纠纷',
- },
- {
- value: 'laodongzhengyijiufen',
- label: '劳动争议纠纷',
- },
- ],
- },
- {
- value: 'linlijiufen',
- label: '邻里纠纷',
- children: [
- {
- value: 'linlijiufen',
- label: '邻里纠纷',
- },
- ],
- },
- ];
-
- //获取id
- const getAppId = async (value) => {
- const res = await getId()
- if (res.type) {
- setFakeData([...fakeData, {
- ...value,
- id: res.data
- }])
- }
- }
-
//获取当前时间
const getFormattedDateTime = () => {
let now = new Date();
@@ -319,9 +278,20 @@
setDialogType(type)
}
+ const handleConfirm = () => {
+ // 处理确认逻辑
+ setScanFile(false);
+ };
+
+ const handleCancel = () => {
+ // 处理取消逻辑
+ setScanFile(false);
+ };
+
//添加当事人
- const handleAddParty = (value) => {
- if (value.id) {
+ const handleAddParty = (value, isEdit) => {
+ console.log(value, isEdit);
+ if (isEdit) {
//编辑
const newList = fakeData.map(item => {
if (item.id === value.id) {
@@ -333,7 +303,9 @@
setFakeData(newList)
setEditData(null)
} else {
- getAppId(value)
+ setFakeData([...fakeData, {
+ ...value
+ }])
}
}
@@ -604,78 +576,11 @@
style={{ marginBottom: '65px' }}
/>
- <Modal style={{ width: '1200px' }} visible={scanFile} onCancel={() => setScanFile(false)} title='识别上传材料' centered footer={null}>
- <Form
- ref={props.formRef}
- layout='vertical'
- requiredSymbol={false}
- initialValues={{
- }}//默认值
- style={{ marginTop: '4px' }}
- >
- <FormItem
- label='选择图片'
- field='file'
- >
- <Upload
- drag
- // multiple
- limit={1}
- accept='image/*'
- // action='/'
- onDrop={(e) => {
- }}
- tip='支持png、 jpg、pdf等格式文件上传，每次上传大小不超过10M'
- showUploadList={{
- // Please dont remove this comment
- fileIcon: <IconLink style={{ color: '#1D2129' }} />,
- }}
- onChange={(info, currentFile) => {
- console.log(currentFile, info, 'info', 'currentFile')
- if (info.length > 0) {
- setScanImage(true);
- }
- setFileView({
- ...currentFile,
- url: URL.createObjectURL(currentFile.originFile),
-
- });
-
- }}
- onSuccess={() => setScanImage(true)}
- />
- {/* <img src={file?.url} alt=""/> */}
- </FormItem>
-
- </Form>
-
- </Modal>
- <Modal style={{ width: '944px' }} visible={scanImage} onCancel={() => setScanImage(false)} footer={null} title='选择识别范围' centered>
- <img
- src={fileView?.url}
- alt=""
- style={{
- display: 'block', // 确保图片在容器中居中显示
- margin: 'auto', // 居中显示
- maxWidth: '100%', // 图片最大宽度为容器宽度的100%
- maxHeight: '100%', // 图片最大高度为容器高度的100%
- objectFit: 'contain', // 图片缩放以适应容器，保持原图比例
- }}
- />
- <div><Button type="primary" onClick={() => setScaned(true)} style={{ marginTop: '20px' }}>开始识别</Button></div>
- </Modal>
- <Modal style={{ width: '1200px' }} visible={scaned} onCancel={() => setScaned(false)} footer={null} title='识别上传材料' centered>
- <div style={{ marginTop: '20px', marginBottom: '8px' }}>识别内容</div>
- <Input.TextArea
- showWordLimit
- rows={5}
- placeholder=''
- wrapperStyle={{ width: '100%' }}
- defaultValue='识别内容'
- onChange={(v) => console.log(v, 'vvvvvv')}
- />
- <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { setScanFile(false); setScanImage(false); setScaned(false) }}>使用文字</Button></div>
- </Modal>
+ <DocumentScanner
+ visible={scanFile}
+ onConfirm={handleConfirm}
+ onCancel={handleCancel}
+ />
<Modal style={{ width: '512px' }} visible={upload} onCancel={() => setUpLoad(false)} footer={null} title='上传材料' centered>
<div style={{ paddingTop: '8px' }}>
<Row gutter={[30, 24]}>
@@ -742,6 +647,7 @@
onClose={() => setAddVisabled(false)}
handleAddParty={handleAddParty}
editData={editData}
+ mainId={props.mainId}
/>
</Modal>
<Modal
@@ -764,6 +670,7 @@
fakeData={fakeData}
dialogType={dialogType}
editData={editData}
+ mainId={props.mainId}
/>
</Modal>
<Modal
--
Gitblit v1.8.0