From b2434de9e541031c17fabe06b3d294ed4823d903 Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Fri, 06 Sep 2024 09:40:48 +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 | 348 +++++++++++++++++++++------------------------------------- 1 files changed, 126 insertions(+), 222 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx index 57329ba..99aec0e 100644 --- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx +++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx @@ -15,46 +15,56 @@ import '../../index.less'; import ApplyDialog from "./applyDialog"; import AgentDialog from "./agentDialog"; -import DetailDialog from "./detailDialog"; import NewFileCheck from '../../../filesCheck/newFileCheck'; import { IconLink } from '@arco-design/web-react/icon'; -import MapView from './map' -import { scan } from '@/assets/images/icon' -import { EventLevelDrawer, MattersDetail } from './levelDetail' +import MapView from './map'; +import { scan } from '@/assets/images/icon'; +import { EventLevelDrawer, MattersDetail } from './levelDetail'; +import DocumentScanner from '../../matterDetail/FileUpLoad'; +import ArcoUpload from '@/components/ArcoUpload'; + const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息 const FormItem = Form.Item; const InputSearch = Input.Search; +const appUrl = $$.appUrl; -function getId() { - return $$.ax.request({ url: `caseUtils/getNewTimeId`, type: 'get', service: 'utils' }); +function delFile(id) { + return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } }); } const VisitorRegister = (props) => { - const [dialogType, setDialogType] = useState(0);//添加当事人的类型 + const formRef = useRef(); + const [dialogType, setDialogType] = useState();//添加当事人的类型 const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制 const [fakeData, setFakeData] = useState([]);//当事人信息数据 const [scanFile, setScanFile] = useState(false); - const [scanImage, setScanImage] = useState(false); - const [scaned, setScaned] = useState(false); const [upload, setUpLoad] = useState(false); - const [sourceType, setSourceType] = useState('09_01010-1'); + const [sourceType, setSourceType] = useState('1'); const [filesCheck, setFilesCheck] = useState(false); - const [fileView, setFileView] = useState(); - const [fileTip, setFileTip] = useState('0'); - const [detailVisabled, setDetailVisabled] = useState(false);//查看信息弹窗控制 const [mapView, setMapView] = useState(false); const [visible, setVisible] = useState(false); const [apply, setApply] = useState(false); 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': '被申请方', '24_00006-1': '申请方代理人', '24_00006-2': '被申请方代理人' } + + const fileType = [ + { value: '1', label: '申请材料' }, + { value: '2', label: '证据材料' }, + ] useEffect(() => { if (props.formRef.current) { @@ -65,89 +75,75 @@ const personIconType = (v) => { switch (v) { - case '09_01010-1': + case '1': return [applyMaterials, applyMaterials_active, ]; - case '09_01010-2': + case '2': return [evidenceMaterials, evidenceMaterials_active]; } } + const handleChangeFile = (data) => { + console.log(data, 'handleChangeFile') + setApplyFile(data) + + } + + const handleChangeFile1 = (data) => { + console.log(data, 'handleChangeFile1') + setEvidenceFile(data) + } + + + //删除文件 + const handleDelFile = async (id) => { + const res = await delFile(id) + if (res.type) { + $$.infoSuccess({ content: '删除成功!' }); + } + } + + const formType = (type) => { - if (type === '09_01010-1') { + if (type === '1') { //申请材料 return ( <> <Col span={24}> - <FormItem + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-101`, + }} field='file' - - > - <Upload - drag - multiple - accept='image/*' - action='/' - height={158} - onDrop={(e) => { - }} - showUploadList={{ - // Please dont remove this comment - fileIcon: <IconLink style={{ color: '#1D2129' }} />, - }} - onChange={(v) => { - setFileTip((prevLength) => { - if (v.length > 0) { - console.log(v, 'vvvvvvv'); - return v.length; - } - return v.length; - }); - }} - tip='支持png、 jpg、excel、word、pdf等格式的文件上传,每次上传大小不超过10M' - /> - - </FormItem> - {fileTip > 0 && <div style={{ position: 'absolute', top: '203px', left: '16px', color: '#86909C' }}> 申请材料累计上传:<span style={{ color: '#1A6FB8' }}>{fileTip}</span></div>} + handleChangeFile={handleChangeFile} + label='' + editData={props.editData} + handleDelFile={handleDelFile} + onFileListChange={(v) => { setFileLength(v); console.log(v, 'vvsetFileLength') }} + /> + {fileLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传:<span style={{ color: '#1A6FB8' }}>{fileLength?.length}</span></div>} </Col> </> ) } - if (type === '09_01010-2') { + if (type === '2') { //证据材料 return ( <> <Col span={24}> - <FormItem - field='file' + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-102`, + }} + field='file1' + handleChangeFile={handleChangeFile1} + label='' + editData={props.editData} + handleDelFile={handleDelFile} + onFileListChange={(v) => { SetEvidenceLength(v); console.log(v, 'vvsetFileLength') }} - > - <Upload - drag - multiple - accept='image/*' - action='/' - height={158} - onDrop={(e) => { - }} - showUploadList={{ - // Please dont remove this comment - fileIcon: <IconLink style={{ color: '#1D2129' }} />, - }} - onChange={(v) => { - setFileTip((prevLength) => { - if (v.length > 0) { - console.log(v, 'vvvvvvv'); - return v.length; - } - return v.length; - }); - }} - tip='支持png、 jpg、excel、word、pdf等格式的文件上传,每次上传大小不超过10M' - /> - - </FormItem> - {fileTip > 0 && <div style={{ position: 'absolute', top: '203px', left: '16px', color: '#86909C' }}> 证据材料累计上传:<span style={{ color: '#1A6FB8' }}>{fileTip}</span></div>} + /> + {evidenceLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传:<span style={{ color: '#1A6FB8' }}>{evidenceLength?.length}</span></div>} </Col> </> ) @@ -222,10 +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> ) @@ -261,50 +258,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 handleCheckParty = (value) => { - setDialogType(value.perType) - setDetailVisabled(true) - } - //获取当前时间 const getFormattedDateTime = () => { let now = new Date(); @@ -327,9 +280,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) { @@ -341,7 +305,9 @@ setFakeData(newList) setEditData(null) } else { - getAppId(value) + setFakeData([...fakeData, { + ...value + }]) } } @@ -365,10 +331,12 @@ setEditData(value) } + // console.log(sourceType, 'sourceType') + // console.log(props.formRef?.current?.getFields(),'formRef.current.getFields()') + return ( - <div className='dataSync-page'> - + <div className='dataSync-page' style={{ ...props.style, marginTop: '8px' }}> <Col span={24} style={{ display: 'flex', alignItems: 'center' }}> <Space size='small'> <div className='MediationInfo-subTitle' style={{ marginTop: '-9px', }}></div><h4>当事人信息</h4> @@ -378,7 +346,6 @@ <PersonCard isCheck={true} data={fakeData} - handleCheckParty={handleCheckParty} handleAdd={handleAdd} handleDeleteParty={handleDeleteParty} handleEdit={handleEdit} @@ -434,13 +401,28 @@ <FormItem label={(<div style={{ display: 'flex' }}>纠纷类型<div className="must">必填</div></div>)} rules={[{ message: '请选择纠纷类型', required: true }]} - field='caseType' + field='myCaseType' > <Cascader placeholder='请选择' - options={options1} + options={$$.caseTypeSelect.caseTypeSelect} onChange={(value, option) => { - console.log(value, option); + if (option) { + props.formRef.current.setFieldsValue({ + caseTypeFirst: option[0].value, + caseTypeFirstName: option[0].label, + caseType: option[1].value, + caseTypeName: option[1].label, + }) + } else { + //清除数据 + props.formRef.current.setFieldsValue({ + caseTypeFirst: undefined, + caseTypeFirstName: undefined, + caseType: undefined, + caseTypeName: undefined, + }) + } }} allowClear /> @@ -475,7 +457,7 @@ </FormItem> </Col> <Col span={8}> - <FormItem label='问题属地' field='quesAddress'> + <FormItem label='问题属地' field='myQuesAddress'> <Cascader placeholder='请选择' options={$$.locationOption()} @@ -599,82 +581,15 @@ 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]}> - {$$.options.fileOwnerType.map((x, t) => { + {fileType.map((x, t) => { return ( <Col span={12} key={t}> <div @@ -706,11 +621,11 @@ <Row gutter={[32, 0]}>{formType(sourceType)}</Row> </Form> </Col> - <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }}>上传完成</Button> + <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength?.length); setEvidenceNumber(evidenceLength?.length); setUpLoad(false) }}>上传完成</Button> </Row> </div> - </Modal> + </Modal > <Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered> {/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */} <div style={{ marginTop: '-16px' }}> @@ -737,6 +652,7 @@ onClose={() => setAddVisabled(false)} handleAddParty={handleAddParty} editData={editData} + mainId={props.mainId} /> </Modal> <Modal @@ -759,20 +675,8 @@ fakeData={fakeData} dialogType={dialogType} editData={editData} + mainId={props.mainId} /> - </Modal> - <Modal - title={'查看' + peopleMap[dialogType]} - visible={detailVisabled} - onOk={() => setDetailVisabled(false)} - onCancel={() => setDetailVisabled(false)} - autoFocus={false} - focusLock={true} - footer={null} - unmountOnExit={true} - maskClosable={false} - > - <DetailDialog /> </Modal> <Modal style={{ width: '1200px' }} @@ -803,7 +707,7 @@ visible={apply} onClose={() => setApply(false)} /> - </div> + </div > ) } -- Gitblit v1.8.0