From 362fc56a323cbfc75cf70f64e76d8b2ebadefe45 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Thu, 29 Aug 2024 10:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/visit/component/applyDialog.jsx | 4 +-
gz-customerSystem/src/views/register/visit/check.jsx | 2
gz-customerSystem/src/views/register/index.less | 18 +++++++++
gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx | 8 +++-
gz-customerSystem/src/views/register/visit/component/agentDialog.jsx | 2
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 10 ++--
gz-customerSystem/src/views/register/visit/preview.jsx | 2
gz-customerSystem/src/views/register/visit/component/detailDialog.jsx | 2
gz-customerSystem/src/api/appUrl.js | 10 ++--
gz-customerSystem/src/views/register/visit/index.jsx | 9 ++--
gz-customerSystem/src/views/register/visit/component/handle.jsx | 44 +++++++++++++++++++---
11 files changed, 82 insertions(+), 29 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 12e5bab..170b127 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,20 +2,20 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-27 11:18:00
+ * @LastEditTime: 2024-08-29 09:50:55
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: api地址
*/
export const debug = {
// web服务
- baseUrl: 'http://gz.hugeinfo.com.cn',
- // baseUrl: 'http://192.168.3.108:9002',
+ // baseUrl: 'http://gz.hugeinfo.com.cn',
+ baseUrl: 'http://192.168.3.108:9002',
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- // fileUrl: 'http://192.168.3.108:9002',
- fileUrl: 'http://gz.hugeinfo.com.cn',
+ fileUrl: 'http://192.168.3.108:9002',
+ // fileUrl: 'http://gz.hugeinfo.com.cn',
// 文件查看url 后面接附件编号
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index ae1a332..4c73c7e 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -249,6 +249,7 @@
}
.mapVicinityIcon {}
+
.mapVicinityIcon {
background: url('../../assets/images/icon/selectIcon.png') no-repeat center center;
width: 14px;
@@ -297,4 +298,21 @@
background-color: rgb(255, 255, 255);
}
}
+}
+
+.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;
}
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/check.jsx b/gz-customerSystem/src/views/register/visit/check.jsx
index f34d6f8..728bb3c 100644
--- a/gz-customerSystem/src/views/register/visit/check.jsx
+++ b/gz-customerSystem/src/views/register/visit/check.jsx
@@ -14,7 +14,7 @@
import '../index.less';
import { Space } from 'antd';
import { Button, Steps } from '@arco-design/web-react';
-import VisitorRegister from './component/visitorRegister';
+import VisitorRegister from './component/VisitorRegister';
import Preview from './preview';
const Step = Steps.Step;
diff --git a/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx b/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
index 4e346eb..f86bad3 100644
--- a/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/MattersInfo.jsx
@@ -16,7 +16,7 @@
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'
+import Handle from './Handle'
const TabPane = Tabs.TabPane;
const style = {
@@ -305,10 +305,14 @@
</Typography.Paragraph>
}
{
- props.active === '3' && <Typography.Paragraph style={style}>
+ props.active === '3' && props.current === 3 && <Typography.Paragraph style={style}>
<Handle />
</Typography.Paragraph>
}
+ {
+ props.active === '3' && props.current === 2 && <Typography.Paragraph style={style}>
+ </Typography.Paragraph>
+ }
</div>
)
}
diff --git a/gz-customerSystem/src/views/register/visit/component/agentDialog.jsx b/gz-customerSystem/src/views/register/visit/component/agentDialog.jsx
index bea0658..639a593 100644
--- a/gz-customerSystem/src/views/register/visit/component/agentDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/agentDialog.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useRef, Fragment } from "react";
import { Row, Col, Space } from 'antd';
import { Form, Input, Button, Radio, Select, Checkbox, Upload } from '@arco-design/web-react';
-import KeyVisits from "./keyVisits";
+import KeyVisits from "./KeyVisits";
import {
IconLink,
} from '@arco-design/web-react/icon';
diff --git a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
index 95eca5e..519d615 100644
--- a/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/applyDialog.jsx
@@ -13,8 +13,8 @@
caseperfection_organize_active,
} from '@/assets/images/icon';
import { Form, Input, Button, Radio, Select, Modal, Cascader, Upload, Message } from '@arco-design/web-react';
-import KeyVisits from "./keyVisits";
-import SelectUnitDialog from "./selectUnitDialog";
+import KeyVisits from "./KeyVisits";
+import SelectUnitDialog from "./SelectUnitDialog";
import {
IconLink,
} from '@arco-design/web-react/icon';
diff --git a/gz-customerSystem/src/views/register/visit/component/detailDialog.jsx b/gz-customerSystem/src/views/register/visit/component/detailDialog.jsx
index cd9a8b9..c82e7f7 100644
--- a/gz-customerSystem/src/views/register/visit/component/detailDialog.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/detailDialog.jsx
@@ -1,5 +1,5 @@
import React, { useState } from 'react'
-import KeyVisits from "./keyVisits";
+import KeyVisits from "./KeyVisits";
import { link } from '@/assets/images'
export default function DetailDialog(props) {
diff --git a/gz-customerSystem/src/views/register/visit/component/handle.jsx b/gz-customerSystem/src/views/register/visit/component/handle.jsx
index 6c8cb7b..0ba90b8 100644
--- a/gz-customerSystem/src/views/register/visit/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/handle.jsx
@@ -2,11 +2,18 @@
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 { Form, Select, Empty, Tabs, Typography, } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
const Option = Select.Option;
const FormItem = Form.Item;
+const TabPane = Tabs.TabPane;
+
+const style = {
+ textAlign: 'center',
+ marginTop: 20,
+};
+
const Handle = () => {
@@ -97,14 +104,39 @@
</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="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='secondary'>返回上级页面</Button>
</Space>
</div>
- <div className='container-bottom-right'>22</div>
+ <div className='container-bottom-right'>
+ <Tabs defaultActiveTab='1' className='tabs-container' >
+ <TabPane
+ key='1'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ Tab 1
+ </span>
+ }
+ >
+ <Typography.Paragraph style={style}>
+
+ </Typography.Paragraph>
+ </TabPane>
+ <TabPane
+ key='2'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ Tab 2
+ </span>
+ }
+ >
+ <Typography.Paragraph style={style}>Content of Tab Panel 2</Typography.Paragraph>
+ </TabPane>
+ </Tabs>
+
+ </div>
</div>
</div>
</>
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index e2a0bfc..e5b5b59 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -14,16 +14,16 @@
import { CheckOutlined, } from '@ant-design/icons';
import TableView from '@/components/TableView';
import '../../index.less';
-import ApplyDialog from "./applyDialog";
-import AgentDialog from "./agentDialog";
-import DetailDialog from "./detailDialog";
+import ApplyDialog from "./ApplyDialog";
+import AgentDialog from "./AgentDialog";
+import DetailDialog from "./DetailDialog";
import FilesCheck from '../../../filesCheck';
import NewFileCheck from '../../../filesCheck/newFileCheck';
import { IconLink } from '@arco-design/web-react/icon';
-import MapView from './map'
+import MapView from './Map'
import { scan } from '@/assets/images/icon'
import MyDrawer from '@/components/MyDrawer';
-import { EventLevelDrawer, MattersDetail } from './levelDetail'
+import { EventLevelDrawer, MattersDetail } from './LevelDetail'
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息
const FormItem = Form.Item;
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index b912ecd..5c7ace5 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -14,7 +14,7 @@
import '../index.less';
import { Space } from 'antd';
import { Button, Steps, Tabs } from '@arco-design/web-react';
-import VisitorRegister from './component/visitorRegister';
+import VisitorRegister from './component/VisitorRegister';
import Preview from './preview';
import MattersInfo from './component/MattersInfo';
import { question, register, Matter, transfer } from '@/assets/images'
@@ -25,8 +25,6 @@
function getCaseDataApi(submitData) {
return $$.ax.request({ url: `caseInfo/getCaseInfo?id=${submitData}`, type: 'get', service: 'mediate' });
}
-
-
const Organization = () => {
const formRef = useRef();
@@ -63,6 +61,7 @@
if (formRef.current) {
const data = formRef.current.getFields()
console.log(data);
+ setCurrent(2)
}
}
@@ -121,7 +120,7 @@
</Fragment>
}
{
- current === 3 &&
+ (current === 3 || current === 2) &&
<Tabs defaultActiveTab='1' onChange={(v) => setTabsActive(v)}>
{tabsList?.map(item => {
return <TabPane
@@ -145,7 +144,7 @@
</Steps>
</div>
}
- <MattersInfo active={tabsActive} />
+ <MattersInfo active={tabsActive} current={current} />
</TabPane>
})}
</Tabs>
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index 221e93f..b9791ba 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -14,7 +14,7 @@
import { Modal } from '@arco-design/web-react';
import NewFileCheck from '../../filesCheck/newFileCheck';
import * as $$ from '../../../utils/utility';
-import { EventLevelDrawer, MattersDetail } from './component/levelDetail'
+import { EventLevelDrawer, MattersDetail } from './component/LevelDetail'
const Preview = () => {
--
Gitblit v1.8.0