From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/router/router.js | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index 8ea6b0c..fc2e138 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-28 11:22:41
- * @LastEditTime: 2024-08-27 10:42:32
+ * @LastEditTime: 2024-09-08 15:15:51
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 路由
@@ -135,9 +135,17 @@
import DataSearch from "../views/statistic/dataSearch";
//来访登记
-import Visit from "../views/register/visit"
-//自行排查
-import Check from "../views/register/visit/check"
+import Visit from "../views/register/visit";
+//事件流转
+import EventFlow from "../views/register/eventFlow";
+//办理反馈
+import HandleFeedback from "../views/register/handleFeedback";
+//档案信息
+import FileMessage from "../views/register/matterDetail/fileMessage";
+//结案审核
+import ClosingReview from "../views/register/closingReview";
+//工作台
+import VisitWorkBench from "../views/register";
import Test from "../views/test";
@@ -210,8 +218,15 @@
<Route path="myConfirmation" element={<MyConfirmation />} />
<Route path="judicialOverview" element={<JudicialOverview />} />
{/* 来访登记*/}
- <Route path="visit" element={<Visit />} />
- <Route path="visit/check" element={<Check />} />
+ <Route path="visit/:id?" element={<Visit />} />
+ <Route path="visit/eventFlow/:caseTaskId?/:caseId?" element={<EventFlow />} />
+ <Route path="visit/handleFeedback/:caseTaskId?/:caseId?" element={<HandleFeedback />} />
+ <Route path="visit/fileMessage" element={<FileMessage />} />
+ <Route path="visit/closingReview/:caseTaskId?/:caseId?" element={<ClosingReview />}/>
+ <Route path="visit/visitWorkBench" element={<VisitWorkBench />}/>
+
+
+
{/* 工作流模块 */}
<Route path="workflowTemplate" element={<WorkflowTemplate />} />
<Route path="workflowTemplate/workflowTemplateEdit" element={<WorkflowTemplateEdit />} />
--
Gitblit v1.8.0