From 3a4651056a1afb5c66c5ec65ca68a49e0212be39 Mon Sep 17 00:00:00 2001 From: dminyi <1301963064@qq.com> Date: Tue, 10 Sep 2024 20:37:52 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master --- gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx index 3462a50..cc9155e 100644 --- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx +++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx @@ -2,11 +2,12 @@ * @Author: dminyi 1301963064@qq.com * @Date: 2024-09-02 14:49:13 * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-09-08 18:25:54 + * @LastEditTime: 2024-09-10 19:16:46 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx * @Description: 结案申请 */ import React, { useState, useRef } from 'react'; +import { useNavigate } from 'react-router-dom'; import { Modal, Form, Select, Upload, Input } from '@arco-design/web-react'; import { Col, Space, Button, Tooltip, Radio, Row } from 'antd'; import DocumentScanner from '../../matterDetail/FileUpLoad' @@ -18,6 +19,7 @@ import * as $$ from '@/utils/utility'; const appUrl = $$.appUrl; + const FormItem = Form.Item; function windupApplyApi(data) { @@ -26,8 +28,9 @@ -const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId }) => { +const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId, caseTaskId }) => { const formRef = useRef(); + const navigate = useNavigate(); const formRefWrite = useRef(); const failRef = useRef(); const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab @@ -38,7 +41,6 @@ const [noHandleReason, setNoHandleReason] = useState(false); const [radioValue, setRadioValue] = useState(1); const [mode, setMode] = useState(false) - const [visibleType, setVisibleType] = useState(false) const tabs = [ { index: '1', label: '化解成功' }, @@ -111,20 +113,48 @@ } const windupApply = async (submitData) => { + console.log( + { + mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功', + mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2', + agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2', + agreeTypeName: value === 1 ? '口头协议' : '书面协议', + caseTaskId: caseTaskId, + caseId: caseId, + caseResultId: caseResultId, + ...submitData + }, 'windupApplyData' + ) const res = await windupApplyApi({ + mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功', + mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2', + agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2', + agreeTypeName: value === 1 ? '口头协议' : '书面协议', + caseTaskId: caseTaskId, + caseId: caseId, caseResultId: caseResultId, ...submitData - }) + }) if (res.type) { $$.infoSuccess({ content: '提交成功' }); - setVisibleType(false) + handleOnCancel(); + navigate('/mediate/visit/visitWorkBench') } } return ( <> - <Modal visible={visibleType || visible} onCancel={handleOnCancel} title='申请结案' centered footer={null} style={{ overflow: 'auto' }}> + <Modal + visible={visible} + onCancel={handleOnCancel} + title='申请结案' + centered + footer={null} + style={{ overflow: 'auto' }} + unmountOnExit={true} + maskClosable={false} + > <div className='caseResult-title'>化解结果</div> <div className='caseResult-tabs'> {tabs.map((tab) => ( -- Gitblit v1.8.0