From 7938180736be7e610ef1f27e03b2d3e1b753fe2e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 10:01:02 +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 | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index c27d1d1..93ee1b7 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -15,6 +15,7 @@
import HandleRecord from '../../matterDetail/HandleRecord';
import SupervisingView from '../../matterDetail/Supervising'
import UniteHandle from '../../matterDetail/UniteHandle';
+import { useNavigate } from 'react-router-dom';
const Option = Select.Option;
@@ -82,7 +83,7 @@
}
function delFile(id) {
- return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'delete', service: 'sys', data: { id } });
+ return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } });
}
function getNewTimeIdApi(id) {
@@ -113,7 +114,7 @@
const Handle = ({ authorData, caseTaskId, caseId }) => {
const formRef = useRef();
- const routeData = useParams();
+ const navigate = useNavigate();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
const [wantUser, setWantUser] = useState({});
@@ -131,7 +132,7 @@
const [id, setId] = useState('');
const [uniteHandleId, setUniteHandleId] = useState('');
const [caseResultId, setCaseResultId] = useState('');
- const [managerName,setManagerName] = useState('')
+ const [managerName, setManagerName] = useState('')
const tabs = [
@@ -188,7 +189,7 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi('2105180249501982')
+ const res = await getByIdRoleApi(caseId)
setPersonData(res.data)
}
@@ -214,7 +215,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
} else {
const res = await saveFeedbackApi({
@@ -225,7 +227,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
}
}
@@ -396,7 +399,7 @@
{wantUser.wantUserId ?
<WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
- caseId ?
+ caseId && managerName ?
<WantUserTag name={managerName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
<Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
@@ -453,7 +456,7 @@
>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${'24083010062110001'}&ownerId=${id}&ownerType=${'22_00018-501'}`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseId}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -480,7 +483,7 @@
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => handleCaseResultApply()} >结案申请</Button>
<Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
- <Button type='secondary'>返回上级页面</Button>
+ <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
<div className='container-bottom-right'>
@@ -662,7 +665,7 @@
</Form>
</Modal>
<UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
- <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId}/>
+ <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId} />
</div>
</>
--
Gitblit v1.8.0