From 62096ceaed8a2a54bfb4298e4b0efb5eb64a7dcb Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 14 Aug 2024 11:11:03 +0800
Subject: [PATCH] ✨ feat(来访登记页面): 完善功能
---
gz-customerSystem/src/styles/public.less | 5
gz-customerSystem/src/views/basicInformation/organization/index.jsx | 176 +++++++++++++++++++++++++----------
gz-customerSystem/src/components/personCard/index.jsx | 55 ++++++----
gz-customerSystem/src/views/basicInformation/organization/index.less | 47 ++++++--
4 files changed, 196 insertions(+), 87 deletions(-)
diff --git a/gz-customerSystem/src/components/personCard/index.jsx b/gz-customerSystem/src/components/personCard/index.jsx
index b0fa5e3..a0be0ab 100644
--- a/gz-customerSystem/src/components/personCard/index.jsx
+++ b/gz-customerSystem/src/components/personCard/index.jsx
@@ -8,28 +8,26 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
-import { Typography, Row, Col, Space } from 'antd';
-import { del } from '../../assets/images';
+import { Typography, Row, Col, Space, Tooltip } from 'antd';
+import { del, add } from '../../assets/images';
const { Link, Text } = Typography;
/**
* isCheck, // 是否无操作
- * partyType, // applicant:申请人, respondent:被申请人
* data, // 当事人数据
* handleCheckParty, // 点击查看详情
* handleDeleteParty, // 删除当事人
*/
-const PersonCard = ({ isCheck, partyType, data, handleCheckParty, handleDeleteParty }) => {
- const remark = [{ label: '精神障碍', color: '#C64FBE' }, { label: '吸毒', color: '#D8A247' }, { label: '社区矫正', color: '#B82F6E' }, { label: '刑满释放', color: '#199C8F' }, { label: '流浪', color: '#3ECB7A' }, { label: '重点青少年', color: '#117AC1' }, { label: '涉稳涉访', color: '#6865D7' }, { label: '潜在风险', color: '#2661CE' }]
+const PersonCard = ({ isCheck, data, handleCheckParty, handleDeleteParty }) => {
return (
<Row gutter={[24, 16]}>
{data.map((x, t) => (
- <Col span={8} key={t}>
+ <Col span={7} key={t}>
<div className="public-personCard" style={{ cursor: 'pointer' }}>
<div
- className={`public-personCard-card public-personCard-card-${partyType === 'applicant' ? 'blue' : 'orange'}`}
- onClick={() => handleCheckParty({ type: partyType, editType: 'check', values: x })}
+ className={`public-personCard-card public-personCard-card-${x.partyType === 'applicant' ? 'blue' : 'orange'}`}
+ onClick={() => handleCheckParty({ type: x.partyType, editType: 'check', values: x })}
>
{x.trueName.substr(0, 1)}
<div className="public-personCard-card-check">查看</div>
@@ -40,43 +38,56 @@
<Text style={{ maxWidth: '80%', paddingRight: '8px' }} ellipsis={{ tooltip: x.trueName }}>
{x.trueName}
</Text>
- <div className={`public-personCard-tag public-personCard-tag-${partyType === 'applicant' ? 'blue' : 'orange'}`}>
+ <Text ellipsis={{ tooltip: x.perClassName }} className={`public-personCard-tag public-personCard-tag-${x.partyType === 'applicant' ? 'blue' : 'orange'}`}>
{x.perClassName}
- </div>
+ </Text>
</div>
{
x.person &&
<>
<div>证件号码：{x.mobile}</div>
- <div>联系方式：{x.agentStatus === '2' ? '有' : '无'}</div>
+ <div>联系方式：{x.personNumber}</div>
</>
}
{x.company &&
<>
<div>统一社会信用代码：{x.mobile}</div>
- <div>法定代表人：{x.agentStatus === '2' ? '有' : '无'}</div>
+ <div>法定代表人：{x.companyName}</div>
</>
}
- {x.Respondent &&
- <Space style={{ display: 'flex', flexWrap: 'wrap' }}>
- {remark.map((item, index) => (
- <div key={index} style={{ lineHeight: '22px', padding: '0px 8px', backgroundColor: `${item.color}`, width: 'fit-content', borderRadius: '4px', marginTop: '4px' }}>{item.label}</div>
- ))}
- </Space>
- }
-
-
+ <Space style={{ display: 'flex', flexWrap: 'wrap' }}>
+ {x.remark?.map((item, index) => (
+ <div key={index} style={{ lineHeight: '22px', padding: '0px 8px', backgroundColor: `${item.color}`, width: 'fit-content', borderRadius: '4px', marginTop: '4px' }}>{item.label}</div>
+ ))}
+ </Space>
</div>
</div>
</Col>
))}
+ <Col span={3}>
+ <div className="dataSync-addBtn">
+ <Tooltip
+ title={(<Space direction='vertical '>
+ <div className="dataSync-btnApply" style={{ backgroundColor: '#1A6FB8' }}>申请方</div>
+ <div className="dataSync-btnApply" style={{ backgroundColor: '#FA8C16' }}>被申请方</div>
+ <div className="dataSync-btnApply" style={{ backgroundColor: '#3491FA' }}>代理人</div>
+ </Space>)}
+ placement={data.length % 3 === 0 ? 'left' : "right"}
+ color='#ffff'
+ overlayStyle={{}}
+ >
+ <div style={{ backgroundColor: '#f2f3f5', borderRadius: '50%', width: '64px', height: '64px' }}>
+ <img src={add} alt="添加" style={{ width: '32px', margin: '16px' }} />
+ </div>
+ </Tooltip>
+ </div>
+ </Col>
</Row>
);
};
PersonCard.propTypes = {
isCheck: PropTypes.bool,
- partyType: PropTypes.string,
data: PropTypes.array,
handleCheckParty: PropTypes.func,
handleDeleteParty: PropTypes.func,
diff --git a/gz-customerSystem/src/styles/public.less b/gz-customerSystem/src/styles/public.less
index 9eb7bac..dae4c5e 100644
--- a/gz-customerSystem/src/styles/public.less
+++ b/gz-customerSystem/src/styles/public.less
@@ -648,8 +648,9 @@
line-height: 20px;
border-radius: 2px;
padding: 0 4px;
- display: flex;
- align-items: center;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
&-blue {
background: #e6f7ff;
diff --git a/gz-customerSystem/src/views/basicInformation/organization/index.jsx b/gz-customerSystem/src/views/basicInformation/organization/index.jsx
index 67d987c..25f1c4a 100644
--- a/gz-customerSystem/src/views/basicInformation/organization/index.jsx
+++ b/gz-customerSystem/src/views/basicInformation/organization/index.jsx
@@ -7,7 +7,7 @@
* @Description: 来访登记
*/
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useRef } from "react";
import NewPage from '../../../components/NewPage';
import RegisterTab from '../../../components/registerTab';
import PersonCard from '../../../components/personCard';
@@ -32,7 +32,7 @@
const Organization = () => {
-
+ const formRef = useRef();
// tabs当前选择的标签信息
const [tabsActive, setTabsActive] = useState('1');
@@ -55,28 +55,60 @@
id: 3,
perClassName: '申请方当事人',
trueName: '蓝海科技有限公司',
- mobile: '13800000002',
- agentStatus: '1', // 无代理人
- company: true
+ mobile: '9144010188453Z',
+ company: true,
+ companyName: '张晓梅',//公司法人
+ partyType: 'applicant',//申请人
},
{
id: 1,
perClassName: '申请方代理人',
trueName: '王小明',
- mobile: '13800000001',
- agentStatus: '2', // 有代理人
- person: true
+ mobile: '410106198802121125',
+ person: true,
+ personNumber: '13388888888',//联系方式
+ partyType: 'applicant',
},
{
id: 2,
perClassName: '被申请方当事人',
- trueName: '蓝海科技有限公司',
+ trueName: '大海科技有限公司',
mobile: '13800000002',
- agentStatus: '1', // 无代理人
- person: true,
- Respondent: true
+ company: true,
+ companyName: '郭小聪',//公司法人
+ partyType: 'respondent',//被申请方
+ remark: [{ label: '精神障碍', color: '#C64FBE' }, { label: '吸毒', color: '#D8A247' }, { label: '社区矫正', color: '#B82F6E' }, { label: '刑满释放', color: '#199C8F' }, { label: '流浪', color: '#3ECB7A' }, { label: '重点青少年', color: '#117AC1' }, { label: '涉稳涉访', color: '#6865D7' }, { label: '潜在风险', color: '#2661CE' }]
},
-
+ {
+ id: 2,
+ perClassName: '被申请方代理人',
+ trueName: '张三',
+ mobile: '13800000002',
+ person: true,
+ personNumber: '13399999999',//联系方式
+ partyType: 'respondent',
+ remark: [{ label: '精神障碍', color: '#C64FBE' }]
+ },
+ {
+ id: 2,
+ perClassName: '被申请方代理人',
+ trueName: '张三',
+ mobile: '13800000002',
+ person: true,
+ personNumber: '13399999999',//联系方式
+ partyType: 'respondent',
+ remark: [{ label: '精神障碍', color: '#C64FBE' }]
+ },
+ {
+ id: 2,
+ perClassName: '被申请方代理人',
+ trueName: '张三',
+ mobile: '13800000002',
+ person: true,
+ personNumber: '13399999999',//联系方式
+ partyType: 'respondent',
+ remark: [{ label: '精神障碍', color: '#C64FBE' }]
+ },
];
const fakeData1 = [
@@ -204,6 +236,33 @@
console.log('表格数据刷新');
};
+ //获取当前时间
+ function getFormattedDateTime() {
+ let now = new Date();
+ let year = now.getFullYear();
+ let month = (now.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的，所以要+1
+ let day = now.getDate().toString().padStart(2, '0');
+ let hours = now.getHours().toString().padStart(2, '0');
+ let minutes = now.getMinutes().toString().padStart(2, '0');
+
+ return `${year}-${month}-${day} ${hours}:${minutes}`;
+ }
+
+ //保存信息
+ const handleSave = async () => {
+ if (formRef.current) {
+ try {
+ await formRef.current.validate((errors, values) => {
+ console.log(errors, values);
+ });
+ // Message.info('校验通过，提交成功！');
+ } catch (_) {
+ console.log(formRef.current.getFieldsError());
+ // Message.error('校验失败，请检查字段！');
+ }
+ }
+ }
+
return (
<div style={{ position: 'relative' }}>
@@ -214,30 +273,19 @@
>
<RegisterTab tabs={tabs} activeKey={tabsActive} onChange={(activeKey) => setTabsActive(activeKey)} style={{ background: '#fff' }} />
{tabsActive === '1' &&
- <div style={{ backgroundColor: '#fff', margin: '8px 16px 0px 16px', padding: '12px 16px 16px 16px' }}>
+ <div className='dataSync-page'>
<Col span={24} style={{ display: 'flex', alignItems: 'center' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-6px' }}></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>
+ <PersonCard
+ isCheck={true}
+ partyType={'applicant'} // 这里设定为申请人
+ data={fakeData}
+ handleCheckParty={handleCheckParty}
+ />
</div>
<Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
<Space size='small'>
@@ -245,12 +293,18 @@
</Space>
</Col>
<Form
+ ref={formRef}
layout='vertical'
+ requiredSymbol={false}
+ initialValues={{
+ level: '三级',
+ visitingTime: getFormattedDateTime(),
+ }}
>
<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>
+ <FormItem label='事项等级' field='level' tooltip={<div className='question'>Username is required </div>} >
+ <Select placeholder='Select city' allowClear>
{['一级', '二级', '三级', '四级'].map((option, index) => (
<Option key={option} value={option}>
{option}
@@ -260,24 +314,25 @@
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='来访时间' >
+ <FormItem label='来访时间' field='visitingTime'>
<DatePicker
style={{ width: '100%' }}
format='YYYY-MM-DD HH:mm'
- onChange={onChange}
- onSelect={onSelect}
- onOk={onOk}
+ showTime={true}
/>
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='来访人数（人）'>
+ <FormItem label='来访人数（人）' field='visitingNumber'>
<Input placeholder='请填写' />
</FormItem>
</Col>
<Col span={8}>
<FormItem
- label={(<div style={{ display: 'flex' }}>纠纷类型<div className="must">必填</div></div>)}>
+ label={(<div style={{ display: 'flex' }}>纠纷类型<div className="must">必填</div></div>)}
+ rules={[{ required: true }]}
+ field='disputeType'
+ >
<Select initialValue='Beijing' placeholder='请选择' allowClear>
{['邻里纠纷', '劳动争议纠纷', '劳动纠纷', '经济纠纷'].map((option, index) => (
<Option key={option} value={option}>
@@ -288,22 +343,27 @@
</FormItem>
</Col>
<Col span={8}>
- <FormItem label={(<div style={{ display: 'flex' }}>纠纷发生时间<div className="must">必填</div></div>)}>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>纠纷发生时间<div className="must">必填</div></div>)}
+ rules={[{ required: true }]}
+ field='disputeTime'
+ >
<DatePicker
style={{ width: '100%' }}
placeholder='请选择'
format='YYYY-MM-DD HH:mm'
- onChange={onChange}
- onSelect={onSelect}
- onOk={onOk}
+ showTime={true}
/>
</FormItem>
</Col>
<Col span={8}>
- <FormItem label={(<div style={{ display: 'flex' }}>纠纷发生地点<div className="must">必填</div></div>)}>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>纠纷发生地点<div className="must">必填</div></div>)}
+ rules={[{ required: true }]}
+ field='disputeAddress'
+ >
<InputSearch
searchButton='选择'
- defaultValue='Search content'
placeholder='选择纠纷发生地的详细地址'
/>
</FormItem>
@@ -334,7 +394,15 @@
</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>}
+ 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', cursor: 'pointer' }}>识别上传材料</div>
+ </div>
+ }
>
<Input.TextArea
maxLength={2000}
@@ -347,7 +415,15 @@
</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>}
+ 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', cursor: 'pointer' }}>识别上传材料</div>
+ </div>
+ }
>
<Input.TextArea
maxLength={2000}
@@ -360,7 +436,7 @@
</Col>
<div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#EFF8FF', borderRadius: '2px' }}>
<FormItem label='是否重大矛盾纠纷' style={{ marginBottom: '-20px' }}>
- <RadioGroup options={['A', 'B']} style={{ marginBottom: 20 }} />
+ <RadioGroup options={['否', '是']} style={{ marginBottom: 20 }} />
</FormItem>
</div>
</Row>
@@ -381,7 +457,7 @@
/>
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
- <Button type="primary" style={{ backgroundColor: '#1A6FB8' }}>保存信息</Button>
+ <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave}>保存信息</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='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>自行受理</Button>
diff --git a/gz-customerSystem/src/views/basicInformation/organization/index.less b/gz-customerSystem/src/views/basicInformation/organization/index.less
index 37fde99..543a62e 100644
--- a/gz-customerSystem/src/views/basicInformation/organization/index.less
+++ b/gz-customerSystem/src/views/basicInformation/organization/index.less
@@ -22,7 +22,7 @@
&-tree {
flex: 1;
- overflow: hidden;
+ overflow: hidden;
}
}
@@ -57,6 +57,28 @@
}
.dataSync {
+ &-page {
+ background-color: #fff;
+ margin: 8px 8px 0px 16px;
+ padding: 12px 16px 16px 16px;
+ height: calc(100vh - 211px);
+ overflow-y: scroll;
+ }
+
+ &-addBtn {
+ // width: 150px;
+ // display: flex;
+ // justify-content: center;
+ cursor: pointer;
+ }
+
+ &-btnApply {
+ padding: 5px 12px;
+ display: flex;
+ justify-content: center;
+ cursor: pointer;
+ }
+
&-excel {
background-color: #fff;
position: absolute;
@@ -67,27 +89,26 @@
display: flex;
align-items: center;
justify-content: space-between;
- box-shadow: 4px 0px 5px 0px rgba(0, 0, 0, 0.25);
+ box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.25);
}
}
-.arco-form-label-item .arco-form-item-tooltip{
+.arco-form-label-item .arco-form-item-tooltip {
color: #1A6FB8;
}
//大厅来访
-.must{
+.must {
font-size: 12px;
- color: rgb(245, 63, 63);
- background-color: rgb(255, 236, 232);
- line-height: 20px;
- padding: 0px 4px;
- border-radius: 2px;
- margin-left: 8px;
+ color: rgb(245, 63, 63);
+ background-color: rgb(255, 236, 232);
+ line-height: 20px;
+ padding: 0px 4px;
+ border-radius: 2px;
+ margin-left: 8px;
}
-.arco-btn-primary:not(.arco-btn-disabled){
+.arco-btn-primary:not(.arco-btn-disabled) {
background-color: @main-color;
-}
-
+}
\ No newline at end of file
--
Gitblit v1.8.0