From ccbe1710b9c52b0ca23150b0a9ca763da6e1223c Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 15:43:22 +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/index.jsx | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/index.jsx b/gz-customerSystem/src/views/register/eventFlow/index.jsx
index c6453a2..e41522d 100644
--- a/gz-customerSystem/src/views/register/eventFlow/index.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/index.jsx
@@ -1,19 +1,10 @@
-/*
- * @Author: dminyi 1301963064@qq.com
- * @Date: 2024-08-09 09:59:43
- * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-31 17:13:53
- * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
- * @Description: 来访登记
- */
-
-import React, { useState, useRef, Fragment, useEffect } from "react";
+import React, { useState, useEffect } from "react";
import NewPage from '@/components/NewPage';
import * as $$ from '@/utils/utility';
import "@arco-themes/react-gzzz/css/arco.css";
import '../index.less';
import { Steps, Tabs } from '@arco-design/web-react';
-import { examine, Matter, transfer, applyRecord } from '@/assets/images'
+import { examine, Matter, applyRecord } from '@/assets/images'
import EventFlow from './component/EventFlow';
import Examine from "./component/Examine";
import ApplyInfo from "../matterDetail/ApplyInfo";
@@ -37,11 +28,11 @@
label: '事项详情',
key: 'sxxq',
},
- {
- img: applyRecord,
- label: '申请记录',
- key: 'sqjl',
- },
+ // {
+ // img: applyRecord,
+ // label: '申请记录',
+ // key: 'sqjl',
+ // },
{
img: examine,
label: '回退审核',
@@ -52,19 +43,11 @@
label: '上报审核',
key: 'sbsh',
},
- {
- img: examine,
- label: '结案审核',
- key: 'jash',
- },
- {
- img: examine,
- label: '联合处置申请审核',
- key: 'lhczsh',
- },
]
const Organization = () => {
const routeData = useParams();
+ const caseTaskId = $$.getQueryString('caseTaskId')
+ const caseId = $$.getQueryString('caseId')
const [authorData, setAuthorData] = useState({});
const [tabsList, setTabsList] = useState([]);
const [tabsActive, setTabsActive] = useState();
@@ -76,8 +59,9 @@
//获取权限tab和按钮权限
const getAuthor = async () => {
+ console.log(caseTaskId, caseId)
const res = await getTabButton({
- caseTaskId: routeData.caseTaskId
+ caseTaskId: caseTaskId
})
if (res.type) {
const { tabList } = res.data
@@ -102,15 +86,17 @@
//根据id定义组件
const getTypeDom = (key) => {
if (key === 'dslxq' || key === 'sxxq') {
- return <EventFlow authorData={authorData} caseId={routeData.caseId} />
+ return <EventFlow authorData={authorData} caseId={caseId} caseTaskId={caseTaskId}/>
}
if (key === 'sqjl') {
return <ApplyInfo />
}
- if (key === 'htsh' || key === 'sbsh' || key === 'jash' || key === 'lhczsh') {
- return <Examine type={key} />
+ if (key === 'htsh' || key === 'sbsh' || key === 'lhczsh') {
+ return <Examine type={key} caseTaskId={routeData.caseTaskId} caseId={routeData.caseId} />
}
}
+
+ console.log(caseId, 'caseId')
return (
<div style={{ position: 'relative' }}>
@@ -137,7 +123,7 @@
{getTypeDom(item.key)}
</TabPane>
})}
- </Tabs> : <EventFlow authorData={authorData} />
+ </Tabs> : <EventFlow authorData={authorData} caseId={caseId} />
}
</NewPage>
</div>
--
Gitblit v1.8.0