From 7c6fc5c3f07809162a3d50c1b516ad3fc0097209 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Mon, 19 Aug 2024 19:53:20 +0800
Subject: [PATCH] 弹窗修改
---
gz-customerSystem/src/views/register/visit/component/map.jsx | 3 ++-
gz-customerSystem/src/views/mediate/mediateAll/index.jsx | 6 +++---
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 6 ++++--
gz-customerSystem/src/components/disputeRegistration/casePerfection/Form.jsx | 2 +-
gz-customerSystem/src/views/register/visit/preview.jsx | 11 +++++++----
gz-customerSystem/src/views/filesCheck/newFileCheck.jsx | 8 ++++----
gz-customerSystem/src/components/disputeRegistration/casePerfection/Form1.jsx | 4 ++--
7 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form.jsx b/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form.jsx
index e76e77f..24a6626 100644
--- a/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form.jsx
+++ b/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form.jsx
@@ -314,7 +314,7 @@
<Button type="primary"
onClick={() =>
$$.modalInfo({
- title: '案件信息报仇呢确认',
+ title: '案件信息保存确认',
content: '确定保存本次对案件信息的修改吗?',
okText: '确定保存',
cancelText: '我再想想',
diff --git a/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form1.jsx b/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form1.jsx
index 008b970..04769e8 100644
--- a/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form1.jsx
+++ b/gz-customerSystem/src/components/disputeRegistration/casePerfection/Form1.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2023-12-12 10:01:29
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2023-12-20 17:36:49
+ * @LastEditTime: 2024-08-19 15:32:02
* @FilePath: \hugeDyh2.0\customerSystem\src\components\disputeRegistration\Form1.jsx
* @Description: 调解总览修改表单
*/
@@ -316,7 +316,7 @@
<Button type="primary"
onClick={() => {
$$.modalInfo({
- title: '案件信息报仇呢确认',
+ title: '案件信息保存确认',
content: '确定保存本次对案件信息的修改吗?',
okText: '确定保存',
cancelText: '我再想想',
diff --git a/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx b/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
index d83cb84..602bc57 100644
--- a/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
+++ b/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-11 11:03:44
- * @LastEditTime: 2024-08-17 17:42:03
+ * @LastEditTime: 2024-08-19 10:11:34
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 大厅来访材料附件查看
@@ -23,8 +23,8 @@
import { Button, Menu, Tooltip } from 'antd';
import { useSearchParams } from 'react-router-dom';
import {
- FolderOpenOutlined,
- FolderOutlined,
+ CaretRightOutlined,
+ CaretDownOutlined,
FileOutlined,
FileImageOutlined,
FilePdfOutlined,
@@ -220,7 +220,7 @@
return (
<SubMenu
key={x.ownerTypeName}
- icon={openKeys.includes(x.ownerTypeName) ? <FolderOpenOutlined /> : <FolderOutlined />}
+ expandIcon={openKeys.includes(x.ownerTypeName) ? <CaretRightOutlined /> : <CaretDownOutlined />}
title={x.ownerTypeName}
>
{x.fileList?.map((y, z) => {
diff --git a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
index 3acd427..0c9631b 100644
--- a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
+++ b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: lwh
* @Date: 2022-03-29 14:11:57
- * @LastEditTime: 2024-03-11 16:12:02
+ * @LastEditTime: 2024-08-19 16:18:45
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 调解总览
@@ -159,7 +159,6 @@
tab == '2' && getMediateAllMiniData({ ...data, canal: '22_00001-2', sortType }, tableActive);
tab == '3' && getMediateAllOtherData({ ...data, canal: '22_00001-6', sortType }, tableActive);
tab == '4' && getMediatePlatformData({ ...data, canal: '22_00001-5', sortType }, tableActive);
-
return;
}
if (type === 'reset') {
@@ -203,6 +202,7 @@
// 获取小程序申请数据
async function getMediateAllMiniData(submitData, tableActive) {
+ console.log(submitData,tableActive,'submitData','tableActive','2222')
global.setSpinning(true);
const res = await getMediateAllDataApi(submitData);
global.setSpinning(false);
@@ -472,7 +472,7 @@
onChange: (page, pageSize) => {
setPage(page);
setSize(pageSize);
- handleSearch('changePage', [page, pageSize, sortType], '', mediateTab)
+ handleSearch('changePage', [page, pageSize, sortType], '', mediateTab);
}
}}
rowClassName={(record) => (record.id === data.tableActive ? 'tableRowActive' : '')}
diff --git a/gz-customerSystem/src/views/register/visit/component/map.jsx b/gz-customerSystem/src/views/register/visit/component/map.jsx
index 2833d94..c03315a 100644
--- a/gz-customerSystem/src/views/register/visit/component/map.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/map.jsx
@@ -2,13 +2,14 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-17 14:41:57
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-17 16:25:27
+ * @LastEditTime: 2024-08-19 15:06:35
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\map.jsx
* @Description: 地图
*/
import React from 'react';
import { Map, Marker, NavigationControl, InfoWindow } from 'react-bmapgl';
export default function MapView() {
+
return (
<div>
<Map center={{ lng: 116.402544, lat: 39.928216 }} zoom="11">
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 76c0cd6..c5d0d1b 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -748,9 +748,11 @@
</Modal>
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
- <div className="mediationWindow-modal-main" style={{ display: 'flex' }}>
+ {/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */}
+ <div style={{marginTop:'-16px'}}>
<NewFileCheck />
</div>
+ {/* </div> */}
</Modal>
<Modal
title={'添加' + peopleMap[dialogType]}
@@ -800,7 +802,7 @@
field='name'
onChange={(e) => console.log(e.target.value, 'vvv')}
>
- <Input placeholder='请输入' style={{ width: '510px' }} />
+ <Input placeholder='请输入' style={{ width: '515px' }} />
</FormItem>
<Button style={{ marginRight: '20px' }}>
重置
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index 9caef71..079d2c4 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/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-17 17:03:50
+ * @LastEditTime: 2024-08-19 11:42:52
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx
* @Description: 预览信息
*/
@@ -12,7 +12,7 @@
import '../index.less';
import TableView from '../../../components/TableView';
import { Modal } from '@arco-design/web-react';
-import FilesCheck from '../../filesCheck';
+import NewFileCheck from '../../filesCheck/newFileCheck';
import * as $$ from '../../../utils/utility';
@@ -356,9 +356,12 @@
/>
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
- <div className="mediationWindow-modal-main" style={{ display: 'flex' }}>
- <FilesCheck />
+ {/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */}
+ <div style={{marginTop:'-16px'}}>
+ <NewFileCheck />
</div>
+
+ {/* </div> */}
</Modal>
--
Gitblit v1.8.0