From fc3422d53b7e948d84ac15d60705ecd096c7adb2 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 10 Sep 2024 18:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx | 6 +++++-
gz-customerSystem/src/views/register/index.jsx | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
index c6e8e7a..3c4585c 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
@@ -6,6 +6,8 @@
import SelectObjModal from '@/components/SelectObjModal/selectPerson';
import { useParams } from 'react-router-dom';
import * as $$ from '@/utils/utility';
+import { useNavigate } from 'react-router-dom';
+
const FormItem = Form.Item;
const TextArea = Input.TextArea;
@@ -21,6 +23,7 @@
export default function BackModel(props) {
const routeData = useParams();
+ const navigate = useNavigate();
const formRef = useRef();
const [isModalVisible, setIsModalVisible] = useState(false);
const [wantUser, setWantUser] = useState({});
@@ -63,7 +66,8 @@
const res = await assign({ ...data, caseTaskId: props.caseTaskId })
if (res.type) {
$$.infoSuccess({ content: '交办成功！' });
- props.onCancel()
+ props.onCancel();
+ navigate('/mediate/visit/visitWorkBench')
}
}
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index c6bd0be..28dc3a6 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-08 15:14:12
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 16:54:28
+ * @LastEditTime: 2024-09-10 16:58:03
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -1017,7 +1017,7 @@
const sign = async (caseId, ownerId) => {
const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
if (res.type) {
- $$.infoSuccess('签收成功')
+ $$.infoSuccess({ content: '签收成功' });
}
}
--
Gitblit v1.8.0