Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

zhangyongtian

2024-08-28 80ca7dc60829bf796b3fe72e518ae88b99e574c0

Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

 gz-customerSystem/src/assets/images/empty.png

 gz-customerSystem/src/assets/images/index.js

@@ -2,7 +2,7 @@
 * @Company: hugeInfo
 * @Author: lwh
 * @Date: 2023-04-24 16:12:00
 * @LastEditTime: 2024-08-22 11:33:00
 * @LastEditTime: 2024-08-28 10:47:07
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description:
@@ -45,6 +45,9 @@
import backgroundImage from './backgroundImage.jpg'
import logo1 from './logo1.png';
import register from './register.png';
import Matter from './matter.png';
import transfer from './transfer.png';
import empty from './empty.png';

export {
  ledger_1,
@@ -84,5 +87,8 @@
  closeIcon,
  backgroundImage,
  logo1,
  register
  register,
  Matter,
  transfer,
  empty
};

 gz-customerSystem/src/assets/images/matter.png

 gz-customerSystem/src/assets/images/transfer.png

 gz-customerSystem/src/views/register/index.less

@@ -206,7 +206,8 @@
    padding: 0px 4px;
    border-radius: 2px;
    margin-left: 8px;
 }
}

.mapPopconfirm {
    width: 300px;
    min-height: 90px;
@@ -247,6 +248,7 @@
        color: #1A6FB8;
    }

    .mapVicinityIcon {}
    .mapVicinityIcon {
        background: url('../../assets/images/icon/selectIcon.png') no-repeat center center;
        width: 14px;
@@ -255,3 +257,44 @@
        border: 1px dashed #1A6FB8;
    }
}

.steps {
    background-color: rgb(255, 255, 255);
    margin: 0px 16px;
    padding-top: 16px;
    padding-left: 75px;
}

.container {
    background-color: rgb(242, 243, 245);
    height: calc(-281px + 100vh);
    overflow-y: scroll;

    &-top {
        background-color: #fff;
        margin: 8px 8px 8px 16px;
        padding: 12px 0px 12px 16px;

    }

    &-bottom {
        display: flex;
        flex-direction: row;
        column-gap: 8px;
        /* margin: 8px 16px 22px; */
        margin: 0px 8px 22px 16px;
        // height: 100vh;


        &-left {
            flex: 3 1 0%;
            background-color: rgb(255, 255, 255);
            padding: 12px 0px 12px 16px;
        }

        &-right {
            flex: 1 1 0%;
            background-color: rgb(255, 255, 255);
        }
    }
}

 gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx

@@ -2,7 +2,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-27 11:31:01
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-08-27 19:47:05
 * @LastEditTime: 2024-08-28 14:41:24
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\MattersInfo.jsx
 * @Description: 事项详情
 */
@@ -11,9 +11,9 @@
import PersonCard from '@/components/personCard'
import { Row, Col, Space, Button, Switch } from 'antd';
import TableView from '@/components/TableView'
import { question, register } from '../../../../assets/images'
import { question, register, Matter, transfer } from '../../../../assets/images'
import * as $$ from '@/utils/utility';
import { Tabs, Typography } from '@arco-design/web-react';
import { Tabs, Typography, Steps } from '@arco-design/web-react';
import "@arco-themes/react-gzzz/css/arco.css";
import { IconCalendar, IconClockCircle, IconUser } from '@arco-design/web-react/icon';
import Handle from './handle'
@@ -33,6 +33,9 @@
    const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
    const [upload, setUpLoad] = useState(false);
    const [filesCheck, setFilesCheck] = useState(false);
    const [active, setActive] = useState('1')
    const [current, setCurrent] = useState(3);
    const Step = Steps.Step;


    const fakeColumns = [
@@ -168,15 +171,16 @@

    return (
        <div style={{ position: 'relative' }}>
            <Tabs defaultActiveTab='1'>
            <Tabs defaultActiveTab='1' onChange={(v) => setActive(v)}>
                <TabPane
                    key='1'
                    title={
                        <span>
                            <IconCalendar style={{ marginRight: 6 }} />
                            {active === '1' && <img src={Matter} alt="" style={{ width: '16px', height: '16px', margin: '-5px 12px 0px 0px' }} />}
                            <span style={{ fontSize: '16px' }}>事项详情</span>
                        </span>
                    }

                >
                    <Typography.Paragraph style={style}>
                        <div className='dataSync-page'>
@@ -317,13 +321,15 @@
                    key='3'
                    title={
                        <span>
                            <IconUser style={{ marginRight: 6 }} />
                            {active === '3' && <img src={transfer} alt="" style={{ width: '16px', height: '16px', margin: '-5px 12px 0px 0px' }} />}
                            <span style={{ fontSize: '16px' }}>流转办理</span>
                        </span>
                    }
                >
                    <Typography.Paragraph style={style}>
                        <Handle />
                       
                            <Handle />
                        
                    </Typography.Paragraph>
                </TabPane>
            </Tabs>

 gz-customerSystem/src/views/register/visit/component/handle.jsx

@@ -1,7 +1,12 @@
import React, { useState } from 'react';
import { Steps } from '@arco-design/web-react';
import { Col, Space, Row } from 'antd';
import { register } from '../../../../assets/images'
import { Steps, Button } from '@arco-design/web-react';
import { Col, Space, Row, Tooltip } from 'antd';
import { register, empty } from '../../../../assets/images'
import { Form, Select, Empty } from '@arco-design/web-react';
import { question1, } from '@/assets/images';

const Option = Select.Option;
const FormItem = Form.Item;


const Handle = () => {
@@ -9,8 +14,8 @@
    const Step = Steps.Step;

    return (
        <div style={{ position: 'relative' }}>
            <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
        <>
            <div className='steps'>
                <Steps type='navigation' current={current} onChange={setCurrent} style={{}}>
                    <Step title='来访登记' disabled />
                    <Step title='事件流转' disabled />
@@ -20,8 +25,8 @@
                    <Step title='结案归档' disabled />
                </Steps>
            </div>
            <div>
                <div className='dataSync-page' style={{ height: 'fit-content', paddingBottom: '12px' }}>
            <div className='container'>
                <div className='container-top'>
                    <Col span={24}>
                        <Space size='small'>
                            <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
@@ -50,22 +55,71 @@
                    </Row>

                </div>
                <div style={{ display: 'flex', flexDirection: 'row', columnGap: '8px', margin: '8px 16px 22px 16px' }}>
                    <div style={{ flex: 3, backgroundColor: '#fff' }}>
                        <div className='dataSync-page' style={{ margin: 0 }}>
                            <Col span={24}>
                                <Space size='small'>
                                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理反馈</h5>
                                </Space>
                            </Col>

                        </div>
                <div className='container-bottom'>
                    <div className='container-bottom-left'>
                        <Col span={24} style={{ marginBottom: '8px' }}>
                            <Space size='small'>
                                <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理反馈</h5>
                            </Space>
                        </Col>
                        <Form
                            layout='vertical'
                            requiredSymbol={false}
                            scrollToFirstError={true}
                        >
                            <Row>
                                <Col span={8}>
                                    <FormItem label={<div style={{ display: 'flex' }}>
                                        <span style={{ color: '#86909C' }}>经办人</span>
                                        <Tooltip>
                                            <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
                                        </Tooltip>
                                    </div>
                                    }
                                        field='level' >
                                        <Select placeholder='请选择' allowClear>
                                            {['一级', '二级', '三级', '四级'].map((option, index) => (
                                                <Option key={option} value={option}>
                                                    {option}
                                                </Option>
                                            ))}

                                        </Select>
                                        <Button type='primary' style={{ position: 'absolute', right: 0 }}>保存</Button>
                                    </FormItem>
                                </Col>
                                <Col span={24}>
                                    <div style={{ color: 'rgb(134, 144, 156)' }}>办理记录</div>
                                    <Empty
                                        icon={
                                            <div
                                                style={{
                                                    display: 'flex',
                                                    // width: 160,
                                                    justifyContent: 'center',
                                                }}
                                            >
                                                <img src={empty} alt='' style={{width:'160px',height:'160px'}}/>
                                            </div>
                                        }
                                        description='暂无数据'
                                    />
                                </Col>
                            </Row>
                        </Form>
                        <Space>
                            <Button type="primary" style={{ backgroundColor: '#1A6FB8' }}>保存</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>
                            <Button type='secondary'>返回上级页面</Button>
                        </Space>
                    </div>
                    <div style={{ flex: 1, backgroundColor: '#fff' }}>22</div>
                    <div className='container-bottom-right'>22</div>
                </div>
            </div>
        </div>
        </>
    )

}

 gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx

@@ -371,6 +371,7 @@

  //添加当事人
  const handleAddParty = (value) => {
    console.log(value,'value1');
    if (value.id) {
      //编辑
      const newList = fakeData.map(item => {
@@ -417,7 +418,7 @@

      <Col span={24} style={{ display: 'flex', alignItems: 'center' }}>
        <Space size='small'>
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px', }}></div><h4>当事人信息</h4>
        </Space>
      </Col>
      <div style={{ margin: '16px 0' }}>
@@ -433,7 +434,7 @@
      </div>
      <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
        <Space size='small'>
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5>
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>纠纷基本情况</h4>
        </Space>
      </Col>
      <Form
@@ -615,7 +616,7 @@
      </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>
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
        </Space>
      </Col>
      <TableView

 gz-customerSystem/src/views/register/visit/index.jsx

@@ -2,7 +2,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-09 09:59:43
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-08-27 20:05:31
 * @LastEditTime: 2024-08-28 14:38:20
 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
 * @Description: 来访登记
 */
@@ -69,7 +69,7 @@
    function selfAcceptance() {
        $$.modalInfo({
            title: '自行受理确认',
            content: '确定自行受理本次登记事项吗？自行受理成功后事项将直接进入到本单位办理流程',
            content: '确定自行受理吗？',
            okText: '确定受理',
            cancelText: '我再想想',
            onOk: async () => {
@@ -126,15 +126,20 @@
                </NewPage>
            }
            {tabsActive === '2' &&
                <NewPage
                    pageHead={
                        { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
                    }
                >
                    <Fragment>
                        <MattersInfo />
                    </Fragment>
                </NewPage>
                <div style={{ position: 'relative' }}>

                    <NewPage
                        pageHead={
                            { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
                        }
                    >

                        <Fragment>

                            <MattersInfo />
                        </Fragment>
                    </NewPage>
                </div>
            }
        </div>
    )

 gz-customerSystem/src/views/register/visit/preview.jsx

@@ -2,7 +2,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-13 15:19:57
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-08-27 19:25:55
 * @LastEditTime: 2024-08-28 11:42:44
 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx
 * @Description: 预览信息
 */
@@ -129,9 +129,9 @@

    return (
        <div style={{ backgroundColor: '#ffff', margin: '8px 16px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 211px)', overflowY: 'scroll' }}>
            <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
            <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
                <Space size='small'>
                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>当事人信息</h4>
                </Space>
            </Col>
            <div style={{ marginBottom: '8px' }}>申请方</div>
@@ -278,9 +278,9 @@
                    </td>
                </tr>
            </table>
            <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
            <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
                <Space size='small'>
                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5>
                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>纠纷基本情况</h4>
                </Space>
            </Col>
            <Row gutter={[16, 16]}>
@@ -345,7 +345,7 @@
            </Row>
            <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>
                    <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
                </Space>
            </Col>