From 3c3ac0c2c225f763fffb05ad669d76b50b4f6e45 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 06 Sep 2024 16:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 039692d..186e5cf 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Space, Row, Tooltip } from 'antd';
-import { register,} from '@/assets/images';
+import { register, } from '@/assets/images';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
@@ -13,7 +13,7 @@
import ArcoUpload from '@/components/ArcoUpload';
import HandleRecord from '../../matterDetail/HandleRecord';
import SupervisingView from '../../matterDetail/Supervising'
-
+import UniteHandle from '../../matterDetail/UniteHandle'
const Option = Select.Option;
const FormItem = Form.Item;
@@ -107,20 +107,19 @@
const formRef = useRef();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
-
-
const [wantUser, setWantUser] = useState({});
const [formView, setFormView] = useState(false);
const [personView, setPersonView] = useState(false);
const [supervising, setSupervising] = useState(false)
const [data, setData] = useState({})
const [caseResult, SetCaseResult] = useState(false);
- const [response, setResponse] = useState('')
const [list, setList] = useState([]);
const [mode, SetMode] = useState(false);
- const [modeDetail, setModeDetail] = useState(false);
- const [radioValue, setRadioValue] = useState('')
- const [detail, setDetail] = useState(false);
+ const [uniteHandleView, setUniteHandleView] = useState(false);
+ const [isModalVisible, setIsModalVisible] = useState(false);
+ const [id, setId] = useState('');
+ const [uniteHandleId, setUniteHandleId] = useState('');
+
const tabs = [
{ index: '1', label: '承办部门' },
@@ -140,8 +139,6 @@
{ index: '1', label: '公共模板1：回复督办内容收到通用范本' },
]
- const [isModalVisible, setIsModalVisible] = useState(false);
- const [id, setId] = useState('')
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
@@ -225,17 +222,21 @@
}
//获取理由id
- const getNewTimeId = async () => {
+ const getNewTimeId = async (type) => {
const res = await getNewTimeIdApi()
if (res.type) {
- setId(res.data)
+ if (type === 'uniteHandle') {
+ setUniteHandleId(res.data)
+ }
+ if (type === 'addMark')
+ setId(res.data)
}
}
//添加办理记录
const addMark = () => {
setFormView(!formView);
- getNewTimeId()
+ getNewTimeId('addMark')
}
//保存信息
@@ -256,6 +257,13 @@
const Supervising = () => {
setSupervising(!supervising)
}
+
+ const uniteHandle = () => {
+ getNewTimeId('uniteHandle')
+ setUniteHandleView(!uniteHandleView)
+ }
+
+
const handleTabChange1 = (newTabIndex) => {
setSelectedTab1(newTabIndex);
@@ -411,7 +419,7 @@
</Form>
<Space style={{ marginTop: '38px', bottom: '4px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>联合处置申请</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => SetCaseResult(!caseResult)}>结案申请</Button>
<Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
<Button type='secondary'>返回上级页面</Button>
@@ -523,7 +531,7 @@
<Col span={24}>
<FormItem
label={<div style={{ display: 'flex' }}><div>督办部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
- field='caseDes'
+ field=''
>
<Select
mode='multiple'
@@ -593,6 +601,7 @@
</Row>
</Form>
</Modal>
+ <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
<CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />
</div>
--
Gitblit v1.8.0