From 7bec45c3da050deda516f96b0a89f94b06814ae9 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 10 Sep 2024 16:59:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 3502fd9..97153d1 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import NewPage from '@/components/NewPage';
-import { Steps, Tabs, Button } from '@arco-design/web-react';
+import { Steps, Tabs, Button, Badge } from '@arco-design/web-react';
import { apply, floating } from '@/assets/images';
import { result } from '@/assets/images/icon';
import * as $$ from '@/utils/utility';
@@ -12,6 +12,7 @@
import { Scrollbars } from "react-custom-scrollbars";
import RateModule from './RateModule';
import RegisInfoModule from './RegisInfoModule';
+import SupervisingView from "./Supervising";
const Step = Steps.Step;
const TabPane = Tabs.TabPane;
@@ -32,10 +33,9 @@
return $$.ax.request({ url: `caseFeedback/listFeedback?id=` + id, type: 'get', service: 'mediate' });
}
-function getListCaseFlow(data) {
- return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
+function getListCaseFlow(caseId) {
+ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=` + caseId, type: 'get', service: 'mediate' });
}
-
const FileMessage = (props) => {
const caseTaskId = $$.getQueryString('caseTaskId')
@@ -67,6 +67,7 @@
const [progressData, setProgressData] = useState({});
useEffect(() => {
+ console.log(caseId, 'caseId')
getByCaseId(caseId);
getTransactResult(caseId);
getCaseInfo(caseId);
@@ -110,9 +111,7 @@
}
const getData = async (id) => {
- const res = await getListCaseFlow({
- caseId: id
- })
+ const res = await getListCaseFlow(id)
if (res.type) {
setProgressData(res.data)
}
@@ -185,7 +184,33 @@
}
{
tabsActive === '2' &&
- <ProgressStep progressData={progressData} />
+ <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}>
+ <Tabs defaultActiveTab='1' >
+ <TabPane
+ key='1'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ 流转进度
+ </span>
+ }
+ >
+ <ProgressStep progressData={progressData} hasTab={true} />
+ </TabPane>
+ <TabPane
+ key='2'
+ title={
+ <span style={{ fontSize: '15px' }}>
+ 督办信息
+ <Badge maxCount={99} count={1000} />
+ </span>
+ }
+ >
+ <div style={{ marginBottom: '20px' }}>
+ <SupervisingView id={''} />
+ </div>
+ </TabPane>
+ </Tabs>
+ </div>
}
{
tabsActive === '3' &&
--
Gitblit v1.8.0