From c19e349f8c93ff63b56fa550ab38d68d67c6905b Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Wed, 14 Aug 2024 11:29:49 +0800 Subject: [PATCH] 合并冲突 --- gz-customerSystem/src/views/register/visit/index.jsx | 405 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 395 insertions(+), 10 deletions(-) diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx index 513a9b6..11ff413 100644 --- a/gz-customerSystem/src/views/register/visit/index.jsx +++ b/gz-customerSystem/src/views/register/visit/index.jsx @@ -1,18 +1,403 @@ /* * @Author: dminyi 1301963064@qq.com - * @Date: 2024-08-09 15:47:38 + * @Date: 2024-08-09 09:59:43 * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-08-09 15:48:16 - * @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\index.jsx - * @Description: 大厅来访 + * @LastEditTime: 2024-08-13 16:05:42 + * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx + * @Description: 来访登记 */ -import React from 'react'; -const Visit=()=>{ +import React, { useState, useEffect } from "react"; +import NewPage from '../../../components/NewPage'; +import RegisterTab from '../../../components/registerTab'; +import PersonCard from '../../../components/personCard'; +import * as $$ from '../../../utils/utility'; +import { add, question1 } from '../../../assets/images'; +import { Row, Col, Space, Tooltip } from 'antd'; +import { Form, Input, Button, Radio, Select, DatePicker, Cascader } from '@arco-design/web-react'; +import "@arco-design/web-react/dist/css/arco.css"; +import TableView from '../../../components/TableView'; +import Preview from './preview'; +import '../index.less' - return( - <></> - ) +const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息 +const FormItem = Form.Item; +const Option = Select.Option; +const InputSearch = Input.Search; + + + +function getCaseDataApi(submitData) { + return $$.ax.request({ url: `caseInfo/getCaseInfo?id=${submitData}`, type: 'get', service: 'mediate' }); } -export default Visit; \ No newline at end of file + + +const Organization = () => { + + + // tabs当前选择的标签信息 + const [tabsActive, setTabsActive] = useState('1'); + const [visible, setVisible] = useState(false); + const [preview, setPreview] = useState(false); + + const tabs = [ + { label: '事件登记', key: '1' }, + { label: '事件流转', key: '2' }, + { label: '办理反馈', key: '3' }, + { label: '申请结案', key: '4' }, + { label: '当事人评价', key: '5' }, + { label: '结案归档', key: '6', img1: true }, + + ]; + + + const fakeData = [ + { + id: 3, + perClassName: '申请方当事人', + trueName: '蓝海科技有限公司', + mobile: '13800000002', + agentStatus: '1', // 无代理人 + company: true + }, + { + id: 1, + perClassName: '申请方代理人', + trueName: '王小明', + mobile: '13800000001', + agentStatus: '2', // 有代理人 + person: true + }, + { + id: 2, + perClassName: '被申请方当事人', + trueName: '蓝海科技有限公司', + mobile: '13800000002', + agentStatus: '1', // 无代理人 + person: true, + Respondent: true + }, + + ]; + + const fakeData1 = [ + { + id: 1, + caseNo: 'A20230101', + judicNo: 'J20230101', + perClassName: '自然人', + inputUserName: '张三', + mediateUserName: '李四', + judgeName: '王五', + mediator: '赵六', + handlerUserName: '钱七', + returnUserName: '孙八', + expireTime: '2023-08-10T08:00:00.000Z', + processName: '进行中', + otherMediator: '周九', + canalName: '网络', + judicResult: '通过', + assistName: '吴十', + mediTypeName: '民事调解', + serieStatus: '1', // 1 表示非系列案,2 表示系列案 + // 更多字段... + }, + // 更多数据... + ]; + + // 列配置 + const fakeColumns = [ + { + title: '序号', + dataIndex: 'caseNo', + key: 'caseNo', + }, + { + title: '材料类型', + dataIndex: 'judicNo', + key: 'judicNo', + }, + { + title: '材料数量', + dataIndex: 'perClassName', + key: 'perClassName', + }, + { + title: '材料名称', + dataIndex: 'perClassName', + key: 'perClassName', + }, + { + title: '上传时间', + dataIndex: 'perClassName', + key: 'perClassName', + }, + { + title: '操作', + dataIndex: 'perClassName', + key: 'perClassName', + render: (text) => ( + <div style={{ display: 'flex', color: '#1A6FB8', gap: '16px' }}> + <div>查看</div> + <div>删除</div> + <div>下载</div> + <div>上传</div> + </div> + ) + }, + // 更多列配置... + ]; + + const options = [ + { + value: 'beijing', + label: 'Beijing', + children: [ + { + value: 'Beijing', + label: 'Beijing', + children: [ + { + value: 'chaoyang', + label: 'Chaoyang', + }, + ], + }, + ], + }, + { + value: 'shanghai', + label: 'Shanghai', + children: [ + { + value: 'shanghaishi', + label: 'Shanghai', + children: [ + { + value: 'huangpu', + label: 'Huangpu', + }, + ], + }, + ], + }, + ]; + + function onSelect(dateString, date) { + console.log('onSelect', dateString, date); + } + + function onChange(dateString, date) { + console.log('onChange: ', dateString, date); + } + + function onOk(dateString, date) { + console.log('onOk: ', dateString, date); + } + + + function handleCheckParty() { + console.log('check party'); + } + + + const onReload = () => { + console.log('表格数据刷新'); + }; + + + return ( + <div style={{ position: 'relative' }}> + <NewPage + pageHead={ + { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' } + } + > + <RegisterTab tabs={tabs} activeKey={tabsActive} onChange={(activeKey) => setTabsActive(activeKey)} style={{ background: '#fff' }} /> + {tabsActive === '1' && !preview && + <div style={{ backgroundColor: '#fff', margin: '8px 16px 0px 16px', padding: '12px 16px 16px 16px' }}> + <Col span={24} style={{ display: 'flex', alignItems: 'center' }}> + <Space size='small'> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5> + </Space> + </Col> + <div style={{ display: 'flex' }}> + <div style={{ flex: 3 }}> + <PersonCard + isCheck={true} + partyType={'applicant'} // 这里设定为申请人 + data={fakeData} + handleCheckParty={handleCheckParty} + /> + </div> + <div style={{ flex: 1, }}> + <Tooltip + title={(<Space direction='vertical '><div style={{ backgroundColor: '#1A6FB8', padding: '5px 12px', display: 'flex', justifyContent: 'center' }}>申请方</div><div style={{ backgroundColor: '#FA8C16', padding: '5px 12px', display: 'flex', justifyContent: 'center' }}>被申请方</div><div style={{ backgroundColor: '#3491FA', padding: '5px 12px', display: 'flex', justifyContent: 'center' }}>代理人</div></Space>)} + placement="right" color='#ffff' overlayStyle={{}}> + <div onClick={() => setVisible(true)} style={{ backgroundColor: '#E5E6EB', borderRadius: '50%', width: '64px', height: '64px' }}> + <img src={add} alt="添加" style={{ width: '32px', margin: '16px' }} /> + </div> + </Tooltip> + </div> + </div> + <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}> + <Space size='small'> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5> + </Space> + </Col> + <Form + layout='vertical' + > + <Row gutter={[32, 0]}> + <Col span={8}> + <FormItem label='事项等级' field='username' tooltip={<div className='question'>Username is required </div>} > + <Select defaultValue='三级' placeholder='Select city' allowClear> + {['一级', '二级', '三级', '四级'].map((option, index) => ( + <Option key={option} value={option}> + {option} + </Option> + ))} + </Select> + </FormItem> + </Col> + <Col span={8}> + <FormItem label='来访时间' > + <DatePicker + style={{ width: '100%' }} + format='YYYY-MM-DD HH:mm' + onChange={onChange} + onSelect={onSelect} + onOk={onOk} + /> + </FormItem> + </Col> + <Col span={8}> + <FormItem label='来访人数(人)'> + <Input placeholder='请填写' /> + </FormItem> + </Col> + <Col span={8}> + <FormItem + label={(<div style={{ display: 'flex' }}>纠纷类型<div className="must">必填</div></div>)}> + <Select initialValue='Beijing' placeholder='请选择' allowClear> + {['邻里纠纷', '劳动争议纠纷', '劳动纠纷', '经济纠纷'].map((option, index) => ( + <Option key={option} value={option}> + {option} + </Option> + ))} + </Select> + </FormItem> + </Col> + <Col span={8}> + <FormItem label={(<div style={{ display: 'flex' }}>纠纷发生时间<div className="must">必填</div></div>)}> + <DatePicker + style={{ width: '100%' }} + placeholder='请选择' + format='YYYY-MM-DD HH:mm' + onChange={onChange} + onSelect={onSelect} + onOk={onOk} + /> + </FormItem> + </Col> + <Col span={8}> + <FormItem label={(<div style={{ display: 'flex' }}>纠纷发生地点<div className="must">必填</div></div>)}> + <InputSearch + searchButton='选择' + defaultValue='Search content' + placeholder='选择纠纷发生地的详细地址' + /> + </FormItem> + </Col> + <Col span={8}> + <FormItem label='问题属地'> + <Cascader + placeholder='Please select ...' + options={options} + onChange={(value, option) => { + console.log(value, option); + }} + defaultValue={['shanghai', 'shanghaishi', 'huangpu']} + allowClear + /> + </FormItem> + </Col> + <Col span={8}> + <FormItem label='涉及人数(人)'> + <Input placeholder='请填写' /> + </FormItem> + </Col> + + <Col span={8}> + <FormItem label='涉及金额(元)'> + <Input placeholder='请填写' /> + </FormItem> + </Col> + <Col span={24}> + <FormItem + label={<div style={{ display: 'flex' }}>事项概况<Tooltip title='1111'><img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} /></Tooltip><div className="must">必填</div><div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px' }}>识别上传材料</div></div>} + > + <Input.TextArea + maxLength={2000} + showWordLimit + rows={5} + placeholder='请填写问题发生的起因、过程和结果' + wrapperStyle={{ width: '100%' }} + /> + </FormItem> + </Col> + <Col span={24}> + <FormItem + label={<div style={{ display: 'flex' }}>申请请求<Tooltip title='1111'><img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} /></Tooltip><div className="must">必填</div><div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px' }}>识别上传材料</div></div>} + > + <Input.TextArea + maxLength={2000} + showWordLimit + rows={5} + placeholder='希望相关部门如何处理,建议分条描述,如请求1,请求2...' + wrapperStyle={{ width: '100%' }} + /> + </FormItem> + </Col> + <div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#EFF8FF', borderRadius: '2px' }}> + <FormItem label='是否重大矛盾纠纷' style={{ marginBottom: '-20px' }}> + <RadioGroup options={['A', 'B']} style={{ marginBottom: 20 }} /> + </FormItem> + </div> + </Row> + + </Form> + <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}> + <Space size='small'> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>事件材料</h5> + </Space> + </Col> + <TableView + columns={fakeColumns} + dataSource={fakeData1} + size="small" + rowKey="id" + bordered={true} + style={{ marginBottom: '60px' }} + /> + <div className="dataSync-excel"> + <Space size="large" style={{ margin: '4px 14px' }}> + <Button type="primary" style={{ backgroundColor: '#1A6FB8' }}>保存信息</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => setPreview(true)}>预览信息</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>提交信息</Button> + <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>自行受理</Button> + <Button type='secondary'>返回上级页面</Button> + </Space> + </div> + </div> + + } + {preview && <Preview />} + </NewPage> + + </div> + ) +} + +export default Organization; -- Gitblit v1.8.0