From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 407 +++++++++++++++++++++++++++++-----------
gz-customerSystem/src/views/register/index.less | 49 ++++
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 38 ++-
gz-customerSystem/src/views/register/visit/component/levelDetail.jsx | 8
gz-customerSystem/src/utils/selectOption.js | 69 +++++-
5 files changed, 423 insertions(+), 148 deletions(-)
diff --git a/gz-customerSystem/src/utils/selectOption.js b/gz-customerSystem/src/utils/selectOption.js
index ce4d453..977bb33 100644
--- a/gz-customerSystem/src/utils/selectOption.js
+++ b/gz-customerSystem/src/utils/selectOption.js
@@ -98,6 +98,18 @@
label: '身份证明材料',
},
{
+ value: '22_00018-207',
+ label: '代理人授权委托书',
+ },
+ {
+ value: '22_00018-203',
+ label: '企业(机构)登记材料',
+ },
+ {
+ value: '22_00018-204',
+ label: '法定(机构)代表人身份证明材料',
+ },
+ {
value: '22_00018-501',
label: '办理附件',
},
@@ -108,6 +120,40 @@
{
value: '22_00018-507',
label: '督办回复附件',
+ },
+ {
+ value: '22_00018-508',
+ label: '联合处置申请附件',
+ },
+ {
+ value: '22_00018-509',
+ label: '联合处置申请审核附件',
+ },
+ {
+ value: '22_00018-520',
+ label: '回退申请附件',
+ },
+ {
+ value: '22_00018-511',
+ label: '回退审核附件',
+ },
+ {
+ value: '22_00018-512',
+ label: '上报申请附件',
+ },
+ {
+ value: '22_00018-513',
+ label: '上报审核附件',
+ },
+];
+// 附件上传人类型
+const uploaderType = [
+ {
+ value: 1,
+ label: '工作人员',
+ },
+ { value: 2,
+ label: '当事人',
},
];
// 性别
@@ -535,6 +581,17 @@
label: '不同意'
},
];
+// 委托关系
+const agentRelate = [
+ {
+ value: '24_00007-1',
+ label: '亲属',
+ },
+ {
+ value: '24_00007-2',
+ label: '监护人',
+ },
+];
// 企业类型
const enterpriseType = [
{
@@ -815,17 +872,6 @@
{
value: '22_00036-10',
label: '其他部门委托移送',
- },
-];
-// 委托关系
-const agentRelate = [
- {
- value: '24_00007-1',
- label: '亲属',
- },
- {
- value: '24_00007-2',
- label: '监护人',
},
];
@@ -1125,6 +1171,7 @@
personClass,
fileOwnerCat,
fileOwnerType,
+ uploaderType,
sex,
cardType,
nation,
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 3246d0b..89dd7ac 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -2,7 +2,7 @@
import { Col, Space, Row, Tooltip } from 'antd';
import { register, fold, down, empty, link, edit } from '@/assets/images';
import { knock } from '@/assets/images/icon'
-import { Form, Input, Tabs, Typography, Empty, Radio, Button, Modal } from '@arco-design/web-react';
+import { Form, Input, Tabs, Typography, Empty, Radio, Button, Modal, Select } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
import SelectObjModal from '@/components/SelectObjModal/selectPerson';
@@ -13,19 +13,16 @@
import CaseResult from './CaseResult'
import ArcoUpload from '@/components/ArcoUpload';
import HandleRecord from '../../matterDetail/HandleRecord';
+import TableView from '@/components/TableView';
-const InputSearch = Input.Search;
+const Option = Select.Option;
const FormItem = Form.Item;
const TabPane = Tabs.TabPane;
const RadioGroup = Radio.Group;
const appUrl = $$.appUrl;
-const style = {
- // textAlign: 'center',
- // marginTop: 20,
-};
const fakeData = [
{
@@ -122,7 +119,11 @@
const [data, setData] = useState({})
const [caseResult, SetCaseResult] = useState(false);
const [response, setResponse] = useState('')
- const [list, setList] = useState([])
+ const [list, setList] = useState([]);
+ const [mode, SetMode] = useState(false);
+ const [modeDetail, setModeDetail] = useState(false);
+ const [radioValue, setRadioValue] = useState('')
+ const [detail, setDetail] = useState(false);
const tabs = [
{ index: '1', label: '承办部门' },
@@ -130,9 +131,13 @@
];
const tabs1 = [
- { index: '1', label: '公共模板1：化解成功结案意见范本' },
- { index: '2', label: '个人模板1：化解成功结案意见范本（完整版）' }
+ { index: '1', label: '公共模板：提醒尽快启动调解程序督办模板' },
+ { index: '2', label: '个人模板：推动事件尽快办结督办模板' }
]
+
+ const options = [
+ {value:'1',label:'一'},{value:'2',label:'二'},{value:'3',label:'三'}
+ ];
const tabs2 = [
{ index: '1', label: '公共模板1：回复督办内容收到通用范本' },
@@ -149,72 +154,106 @@
choosePrincipal(userId)
}
- const [records, setRecords] = useState([
+ const fakeColumns = [
+ {
+ title: '序号',
+ dataIndex: 'caseNo',
+ key: 'caseNo',
+ width: 51,
+ render: (text, record, index) => <span>{index + 1}</span>,
+ },
+ {
+ title: '类型',
+ dataIndex: 'judicNo',
+ key: 'judicNo',
+ width: 85,
+
+ },
+ {
+ title: '模板名称',
+ dataIndex: 'inputUserName',
+ key: 'perClassName',
+ width: 160,
+ render: (text) => (
+ <>
+ {text}
+ {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
+ </>
+ )
+
+
+ },
+ {
+ title: '模板内容',
+ dataIndex: 'perClassName',
+ key: 'perClassName',
+ width: 400,
+ render: (text) => (
+ <div style={{}}>
+ <div style={{ width: '300px', height: '40px', overflow: 'hidden', display: 'flex', whiteSpace: 'pre-line' }}>{text}</div>
+ <div style={{ color: '#1A6FB8', marginTop: '4px' }} onClick={() => setModeDetail(true)}>...查看更多</div>
+ </div>
+ )
+
+ },
+ {
+ title: '操作',
+ dataIndex: 'perClassName',
+ key: 'perClassName',
+ width: 53,
+ render: (text) => (
+ <div style={{ color: '#1A6FB8' }}>使用</div>
+ )
+ },
+ // 更多列配置...
+ ];
+ const fakeData1 = [
{
id: 1,
- date: '2024 - 7 - 1 10:00',
- location: '天河区棠下街综治中心',
- remark: '配合部门',
- showView: false,
- details: [
- {
- title: '操作人',
- content: (
- <div style={{ display: 'flex' }}>
- <div>李晓明</div>
- <img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
- </div>
- ),
- },
- {
- title: '办理意见',
- content: (
- <div>
- 调解开始，我首先安抚双方情绪，确保对话在一个平和的氛围中展开。随后，我引导王先生详细说明了他的财务困境及还款意愿，同时让银行代表理解其处境，强调长期合作的重要性。经过反复沟通，银行同意调整还款计划，降低利率，并给予王先生一定的宽限期。王先生则承诺按新计划履行还款义务，双方最终达成一致，签署了调解协议。
- </div>
- ),
- },
- {
- title: '办理附件',
- content: (
- <a href="your-link-here.html" target="_blank">
- <img src={link} alt="" className="title-file" />江照月法人身份证明.pdf
- </a>
- ),
- },
- ],
+ caseNo: 'A20230101',
+ judicNo: '公共模板',
+ perClassName: '鉴于本事项的重要性及紧迫性，现要求你尽快启动调解程序[事项1......][事项2......]',
+ inputUserName: '尽快启动调解程序督办',
+ mediateUserName: '2024-7-12 12:00',
+ judgeName: '王五',
+ mediator: '赵六',
+ handlerUserName: '钱七',
+ returnUserName: '孙八',
+ expireTime: '2023-08-10T08:00:00.000Z',
+ processName: '进行中',
+ otherMediator: '周九',
+ canalName: '网络',
+ judicResult: '通过',
+ assistName: '吴十',
+ mediTypeName: '民事调解',
+ serieStatus: '1', // 1 表示非系列案，2 表示系列案
+ // 更多字段...
},
{
id: 2,
- date: '2024 - 7 - 2 14:00',
- location: '天河区天河南街道办事处',
- remark: '承办部门',
- showView: false,
- details: [
- {
- title: '操作人',
- content: (
- <div style={{ display: 'flex' }}>
- <div>张伟</div>
- <img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
- </div>
- ),
- },
- {
- title: '办理意见',
- content: (
- <div>
- 在本次协调会议中，我们成功解决了双方之间的纠纷，确保了所有参与方的利益得到了妥善处理。通过深入交流，各方达成了共识，同意采取一系列措施来解决现存的问题。
- </div>
- ),
- },
- {
- title: '办理附件',
- content: '广州市天河区天河南路200号',
- },
- ],
+ caseNo: 'A20230101',
+ judicNo: '个人模板',
+ perClassName: '鉴于本事项的重要性及紧迫性，现要求你尽快启动调解程序[事项1......][事项2......]',
+ inputUserName: '尽快启动调解程序督办',
+ mediateUserName: '2024-7-12 12:00',
+ judgeName: '王五',
+ mediator: '赵六',
+ handlerUserName: '钱七',
+ returnUserName: '孙八',
+ expireTime: '2023-08-10T08:00:00.000Z',
+ processName: '进行中',
+ otherMediator: '周九',
+ canalName: '网络',
+ judicResult: '通过',
+ assistName: '吴十',
+ mediTypeName: '民事调解',
+ serieStatus: '1', // 1 表示非系列案，2 表示系列案
+ // 更多字段...
},
- ]);
+
+ // 更多数据...
+ ];
+
const [scannerVisible, setScannerVisible] = useState(false);
@@ -342,6 +381,10 @@
const handleResponse = () => {
setResponse(!response)
+ }
+
+ const handleUse = () => {
+ setModeDetail(!modeDetail)
}
@@ -548,34 +591,65 @@
name='lang'
defaultValue='1'
style={{ display: 'flex', margin: '0 16px 0px 16px', }}
+ value={radioValue}
+ onChange={(v) => setRadioValue(v)}
>
<Radio value='1' style={{ flex: 1, textAlign: 'center' }}>未回复</Radio>
<Radio value='2' style={{ flex: 1, textAlign: 'center' }}>已回复</Radio>
</RadioGroup>
- <div className='Supervising'>
- <div style={{ display: 'flex' }}>
- <img src={knock} alt='' style={{ marginRight: '4px' }} />
- <div style={{ color: '#EF6C24' }} >回复期限剩3小时</div>
+ {
+ radioValue === '1' &&
+ <div className='Supervising'>
+ <div style={{ display: 'flex', marginBottom: '4px' }}>
+ <img src={knock} alt='' style={{ marginRight: '4px' }} />
+ <div style={{ color: '#EF6C24' }} >回复期限剩3小时</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办时间：</div>
+ <div>2024-7-12 10:50</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办人：</div>
+ <div>张三丰</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办内容：</div>
+ <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办附件：</div>
+ <img src={link} alt='' style={{ width: '16px' }} />
+ <div>2</div>
+ </div>
+ <Button className='Supervising-btn' size='small' type='outline' onClick={() => handleResponse()}>回复</Button>
</div>
- <div className='Supervising-item'>
- <div className='Supervising-item-title'>督办时间：</div>
- <div>2024-7-12 10:50</div>
+ }
+ {
+ radioValue === '2' &&
+ <div className='Supervising'>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办时间：</div>
+ <div>2024-7-12 10:50</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办人：</div>
+ <div>张三丰</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办内容：</div>
+ <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
+ </div>
+ <div className='Supervising-item'>
+ <div className='Supervising-item-title'>督办附件：</div>
+ <img src={link} alt='' style={{ width: '16px' }} />
+ <div>2</div>
+ </div>
+ <div className='Supervising-info'>
+ <div className='Supervising-info-time'>已于2024-7-13 12:00回复完成</div>
+ <div className='Supervising-info-detail' onClick={() => setDetail(true)}>查看详情</div>
+ </div>
</div>
- <div className='Supervising-item'>
- <div className='Supervising-item-title'>督办人：</div>
- <div>张三丰</div>
- </div>
- <div className='Supervising-item'>
- <div className='Supervising-item-title'>督办内容：</div>
- <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
- </div>
- <div className='Supervising-item'>
- <div className='Supervising-item-title'>督办附件：</div>
- <img src={link} alt='' style={{ width: '16px' }} />
- <div>2</div>
- </div>
- <Button className='Supervising-btn' size='small' type='outline' onClick={() => handleResponse()}>回复</Button>
- </div>
+ }
</Typography.Paragraph>
</TabPane>
</Tabs>
@@ -624,8 +698,8 @@
</table>
</Modal>
<Modal visible={supervising} onCancel={() => setSupervising(false)} title='督办' centered footer={null}>
- <div style={{ marginTop: '18px' }}>督办意见</div>
<Form
+ ref={formRef}
layout='vertical'
requiredSymbol={false}
scrollToFirstError={true}
@@ -634,6 +708,26 @@
}}//默认值
>
<Row>
+ <Col span={24}>
+ <FormItem
+ label={<div style={{display:'flex'}}><div>督办部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
+ field='caseDes'
+ >
+ <Select
+ mode='multiple'
+ placeholder='请选择督办部门'
+ style={{ }}
+ allowClear
+ >
+ {options.map((option) => (
+ <Option key={option.value} value={option.value} onChange={(v)=>console.log(v,'vvvvvv')}>
+ {option.label}
+ </Option>
+ ))}
+ </Select>
+ </FormItem>
+ </Col>
+ <div style={{ marginBottom:'8px' }}>督办意见</div>
<Col span={24}>
<FormItem
field='suggestion'
@@ -727,28 +821,26 @@
<FormItem
field='suggestion'
>
- <div>
-
+ <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+ <div className='tabs1'>
+ {tabs2.map((tab) => (
+ <div
+ key={tab.index}
+ style={{
+ color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)',
+ border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`,
+ borderRadius: '2px',
+ cursor: 'pointer',
+ padding: '0px 8px',
+ }}
+ onClick={() => handleTabChange1(tab.index)}
+ >
+ {tab.label}
+ </div>
+ ))}
+ </div>
+ <div style={{ color: '#1A6FB8' }} onClick={() => SetMode(!mode)}>更多模板</div>
</div>
- <div className='tabs1'>
- {tabs2.map((tab) => (
- <div
- key={tab.index}
- style={{
- color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)',
- border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`,
- borderRadius: '2px',
- cursor: 'pointer',
- padding: '0px 8px',
- }}
- onClick={() => handleTabChange1(tab.index)}
- >
- {tab.label}
- </div>
- ))}
- </div>
- <div>更多模板</div>
-
<Input.TextArea
rows={5}
wrapperStyle={{ width: '700px' }}
@@ -758,7 +850,7 @@
</Col>
<Col span={24}>
<FormItem
- label='附件材料'
+ label={<div style={{ display: 'flex', }}><div>附件材料</div><img src={question1} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /></div>}
field='caseDes'
rules={[{ message: '请填写事项概况', required: true }]}
>
@@ -779,6 +871,93 @@
</Form>
</div>
</Modal>
+ <Modal visible={mode} onCancel={() => SetMode(false)} title='选择模板' centered footer={null}>
+ <TableView
+ columns={fakeColumns}
+ dataSource={fakeData1}
+ size="small"
+ rowKey="id"
+ bordered={true}
+ style={{}}
+ />
+
+ </Modal>
+ <Modal simple={true} visible={modeDetail} cancelText='关闭' okText='使用' onOk={() => handleUse()} onCancel={() => setModeDetail(!modeDetail)} style={{ width: '400px', borderRadius: ' 4px' }}>
+ <div className='modal'>
+ <div className='modal-mark'>模板</div>
+ <div className='modal-title'>尽快启动调解程序督办</div>
+ </div>
+ <div style={{ marginBottom: '-16px' }}>
+ 鉴于本事项的重要性及紧迫性，现要求你尽快启动调解程序，并确保案件能够得到及时有效的处理。请您务必于本周内完成以下
+ 事项：<br />
+ [事项1......]<br />
+ [事项2......]<br />
+ [事项3......]<br />
+ 请确保在事项办理的过程中，遵循公平、公正的原则，并积极促进双方达成共识。
+ </div>
+ </Modal>
+ <Modal visible={detail} onCancel={() => setDetail(false)} title='督办回复详情' centered footer={null}>
+ <Col span={24} style={{ marginBottom: '8px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>督办意见</h5>
+ </Space>
+ </Col>
+ <Row gutter={[16, 16]}>
+ <Col span={24} >
+ <div className="title-text">督办时间</div>
+ <div>2024-7-12 10:50</div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">督办人</div>
+ <div>张三丰
+ <img src={register} alt='' className='icon-register' />
+ </div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">督办内容</div>
+ <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">督办附件</div>
+ <div style={{ display: 'flex' }}>
+ <img src={link} alt="" className="title-file" />
+ <div style={{ color: '#1A6FB8' }}>广东好又多贸易有限公司营业执照副本.pdf</div>
+ </div>
+
+ </Col>
+ </Row>
+ <Col span={24} style={{ marginBottom: '8px', marginTop: '20px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>督办回复</h5>
+ </Space>
+ </Col>
+ <Row gutter={[16, 16]}>
+ <Col span={24} >
+ <div className="title-text">回复时间</div>
+ <div>2024-7-12 10:50</div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">回复人</div>
+ <div>张三丰
+ <img src={register} alt='' className='icon-register' />
+ </div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">回复内容</div>
+ <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
+ </Col>
+ <Col span={24}>
+ <div className="title-text">附件材料</div>
+ <div style={{ display: 'flex' }}>
+ <img src={link} alt="" className="title-file" />
+ <div style={{ color: '#1A6FB8' }}>李晓明的人民调解协议书.pdf</div>
+ </div>
+
+ </Col>
+ </Row>
+
+
+ </Modal>
<CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 0f606bd..d88a16c 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -85,9 +85,10 @@
}
&-file {
- width: 12px;
- margin-right: 4px;
- margin-top: -5px;
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ margin-top: 4px;
}
&-register {
@@ -558,6 +559,18 @@
}
+ &-info{
+ display: flex;
+
+ &-time{
+ margin-right: 8px;
+ }
+
+ &-detail{
+ color: #1A6FB8;
+ }
+ }
+
&-btn {
margin-top: 12px;
color: rgb(26, 111, 184);
@@ -565,4 +578,34 @@
background-color: rgb(255, 255, 255);
}
+}
+
+.modal {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 24px;
+
+ &-mark{
+ color: rgb(26, 111, 184);
+ border: 1px solid rgb(26, 111, 184);
+ padding: 0px 8px;
+ margin-right: 8px;
+ border-radius: 4px;
+ }
+
+ &-title{
+ color: #1D2129;
+ font-size: 16px;
+ font-weight: 500;
+ }
+}
+
+.icon{
+// width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px'
+ &-register{
+ width: 14px;
+ height: 14px;
+ margin-left: 8px;
+ margin-top: -2px;
+ }
}
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx b/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
index 4e10275..43816a1 100644
--- a/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-27 16:47:12
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-03 14:35:13
+ * @LastEditTime: 2024-09-05 17:03:04
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\levelDetail.jsx
* @Description: 右抽屉提示
*/
@@ -22,7 +22,7 @@
>
<div style={{ marginTop: '-8px' }}>
<div>
- <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px' }}>一类重点事件</div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px' }}>一级重点事件</div>
1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
@@ -32,7 +32,7 @@
7、群体性民事纠纷（5人及5人以上的邻里矛盾纠纷、经济债务纠纷、家庭纠纷等可能导致“民转刑”的民事纠纷）；8、存在重大安全隐患、重大不稳定因索的矛盾；9、涉及政治类，非宗教类的非访宣传（在出租屋内从事涉邪教迷信印刷、存放资料的；在公共场所粘贴类似邪教的符号、图案、标志等）10、县（市、区）职能部门、各镇（街道）分管领导根据应急情况认为有必要启动红色预警机制的其他矛盾纠纷。
</div>
<div>
- <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px', marginTop: '20px' }}>二类重点事件</div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px', marginTop: '20px' }}>二级重点事件</div>
1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
@@ -42,7 +42,7 @@
7、群体性民事纠纷（5人及5人以上的邻里矛盾纠纷、经济债务纠纷、家庭纠纷等可能导致“民转刑”的民事纠纷）；8、存在重大安全隐患、重大不稳定因索的矛盾；9、涉及政治类，非宗教类的非访宣传（在出租屋内从事涉邪教迷信印刷、存放资料的；在公共场所粘贴类似邪教的符号、图案、标志等）10、县（市、区）职能部门、各镇（街道）分管领导根据应急情况认为有必要启动红色预警机制的其他矛盾纠纷。
</div>
<div>
- <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px', marginTop: '20px' }}>三类普通事件</div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px', lineHeight: '23px', marginBottom: '8px', marginTop: '20px' }}>三级普通事件</div>
1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 4c41c45..99aec0e 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -49,7 +49,11 @@
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': '被申请方',
@@ -81,16 +85,15 @@
const handleChangeFile = (data) => {
console.log(data, 'handleChangeFile')
- if (data.data && data.data.length != 0) {
- if (data.data[0].idcardOcrResult) {
- const { birthday, ...rest } = data.data[0].idcardOcrResult
- //回填信息
- formRef.current.setFieldsValue({
- ...rest
- })
- }
- }
+ setApplyFile(data)
+
}
+
+ const handleChangeFile1 = (data) => {
+ console.log(data, 'handleChangeFile1')
+ setEvidenceFile(data)
+ }
+
//删除文件
const handleDelFile = async (id) => {
@@ -118,7 +121,7 @@
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>}
+ {fileLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength?.length}</span></div>}
</Col>
</>
)
@@ -133,11 +136,14 @@
action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00018-102`,
}}
field='file1'
- handleChangeFile={handleChangeFile}
+ handleChangeFile={handleChangeFile1}
label=''
editData={props.editData}
handleDelFile={handleDelFile}
+ onFileListChange={(v) => { SetEvidenceLength(v); console.log(v, 'vvsetFileLength') }}
+
/>
+ {evidenceLength?.length > 0 && <div style={{ position: 'absolute', top: '198px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{evidenceLength?.length}</span></div>}
</Col>
</>
)
@@ -212,11 +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>
)
@@ -615,7 +621,7 @@
<Row gutter={[32, 0]}>{formType(sourceType)}</Row>
</Form>
</Col>
- <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength.length); setUpLoad(false) }}>上传完成</Button>
+ <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength?.length); setEvidenceNumber(evidenceLength?.length); setUpLoad(false) }}>上传完成</Button>
</Row>
</div>
--
Gitblit v1.8.0