From 3e192ea40d14b1bd3be24525cc27d392987ed5d8 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 03 Sep 2024 17:07:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/eventFlow/component/BackModel.jsx | 77 +++++++++++++++++++++++++
gz-customerSystem/src/views/register/index.less | 41 ++++++++-----
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 27 ++++++++
3 files changed, 126 insertions(+), 19 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/BackModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/BackModel.jsx
index e59235e..4cbaee5 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/BackModel.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/BackModel.jsx
@@ -1,12 +1,87 @@
-import React from 'react'
+import React, { useRef } from 'react'
+import { Row, Col } from 'antd';
import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react';
+import ArcoUpload from '@/components/ArcoUpload';
+
+const RadioGroup = Radio.Group;
+const FormItem = Form.Item;
+const TextArea = Input.TextArea;
export default function BackModel(props) {
+ const formRef = useRef();
+ const options = [
+ {
+ label: '不属于本部门的职能范围',
+ value: 1
+ },
+ {
+ label: '超出本部门管辖范围',
+ value: 2
+ },
+ {
+ label: '重复上报',
+ value: 3
+ },
+ {
+ label: '无法与当事人取得联系',
+ value: 4
+ },
+ {
+ label: '其他',
+ value: 5
+ },
+ ]
const handleSubmit = () => {
}
return (
<div>
+ <Row style={{ margin: '0 2px 0 0' }}>
+ <Col span={24}>
+ <Form
+ ref={formRef}
+ layout='vertical'
+ requiredSymbol={false}
+ initialValues={{
+ }}//默认值
+ scrollToFirstError
+ >
+ <Row gutter={[32, 0]} style={{ margin: '0 -10px' }}>
+ <Col span={24}>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>回退理由<div className="must">必填</div></div>)}
+ field='trueName'
+ rules={[{ required: true, message: '请选择回退理由' }]}
+ >
+ <RadioGroup direction='vertical' options={options}>
+ </RadioGroup>
+ </FormItem>
+ </Col>
+ <Col span={24}>
+ <FormItem
+ label=' '
+ field='luyou'
+ rules={[{ required: true, message: '回退理由不能为空' }]}
+ >
+ <TextArea
+ autoSize={{ minRows: 4, maxRows: 8 }}
+ placeholder='请填写回退的具体理由'
+ />
+ </FormItem>
+ </Col>
+ <Col span={24} className="doubleFile">
+ <ArcoUpload
+ params={{
+ action: ``,
+ }}
+ field='file'
+ label='附件材料'
+ />
+ </Col>
+ </Row>
+ </Form>
+ </Col>
+ </Row>
<div className='dialogFooter'>
<Button
type="primary"
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index d5f7c12..ef729ea 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -1,8 +1,10 @@
import React, { useState } from 'react';
-import { Button, Modal } from '@arco-design/web-react';
+import { Button, Modal, Tabs } from '@arco-design/web-react';
import { Space } from 'antd';
import ProgressStep from '@/components/ProgressStep/VisitStep';
import BackModel from "./BackModel";
+
+const TabPane = Tabs.TabPane;
const fakeData = [
{
@@ -75,7 +77,28 @@
return (
<div className='dataSync'>
<div className='dataSync-hasTabPage' >
- <ProgressStep progressData={fakeData} />
+ <Tabs defaultActiveTab='1' >
+ <TabPane
+ key='1'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ 流转进度
+ </span>
+ }
+ >
+ <div styles={{ height: "400px" }}><ProgressStep progressData={fakeData} /></div>
+ </TabPane>
+ <TabPane
+ key='2'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ 督办信息
+ </span>
+ }
+ >
+ </TabPane>
+ </Tabs>
+
</div>
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 4309317..814959a 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -130,10 +130,17 @@
&-hasTabPage {
background-color: #fff;
- margin: 8px 8px 0px 16px;
+ margin: 8px 16px 0px 16px;
padding: 12px 16px 64px 16px;
height: calc(100vh - 288px);
- overflow-y: scroll;
+
+ .arco-tabs-header-nav {
+ margin-left: 0 !important;
+ }
+
+ .scrollTabContent {
+ overflow-y: scroll;
+ }
}
}
@@ -368,21 +375,23 @@
margin-right: 16px;
}
-.tabs-container .arco-tabs-header {
- position: relative;
- display: inline-block;
- transition: transform .2s cubic-bezier(.34, .69, .1, 1);
- white-space: nowrap;
- transform: translateX(0px);
- width: 300px;
- flex: 1;
- display: flex;
- justify-content: space-evenly;
-}
+.tabs-container {
+ .arco-tabs-header {
+ position: relative;
+ display: inline-block;
+ transition: transform .2s cubic-bezier(.34, .69, .1, 1);
+ white-space: nowrap;
+ transform: translateX(0px);
+ width: 300px;
+ flex: 1;
+ display: flex;
+ justify-content: space-evenly;
+ }
-.tabs-container .arco-tabs-header-ink {
- left: 83.988px;
- width: 82px;
+ .arco-tabs-header-ink {
+ left: 83.988px;
+ width: 82px;
+ }
}
.progress {
--
Gitblit v1.8.0