From 285c372ff89f2a2ca57e5c957540967526e15c04 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 10 Sep 2024 16:55:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 69 +++++++++++++---------------------
1 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 17d0936..99f4559 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/index.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
@@ -3,7 +3,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-08 11:17:47
+ * @LastEditTime: 2024-09-10 16:22:30
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*
@@ -38,20 +38,20 @@
return $$.ax.request({ urlAi: `case-law/get-law`, typeAi: 'post', service: 'mediate', data });
}
-function getCaseDetailApi(data) {
- return $$.ax.request({ urlAi: `case-law/get-case-detail`, typeAi: 'get', service: 'mediate', data });
-}
-function getTabButton(data) {
- return $$.ax.request({ url: `caseTask/getTabButton`, type: 'get', service: 'mediate', data });
+
+function getTabButton(caseTaskId) {
+ return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
}
const Organization = () => {
const routeData = useParams();
+ const caseTaskId = $$.getQueryString('caseTaskId')
+ const caseId = $$.getQueryString('caseId')
const [current, setCurrent] = useState(3);
- const [tabsActive, setTabsActive] = useState('1');
+ const [tabsActive, setTabsActive] = useState('sxxq');
const [AiQuestionView, setAiQuestionView] = useState(false)
const [aiData, setAiData] = useState([])
const [aiLawData, setAiLawData] = useState([])
@@ -63,23 +63,18 @@
{
img: Matter,
label: '事项详情',
- key: '1'
+ key: "sxxq"
},
{
img: transfer,
- label: '流转办理',
- key: '2',
+ label: '事项办理',
+ key: "sxbl",
isNeedStep: true,
},
{
img: applyRecord,
label: '申请记录',
- key: '3',
- },
- {
- img: Audit,
- label: '审核',
- key: '4',
+ key: "sqjl",
},
]
@@ -110,22 +105,13 @@
}
}
- const getCaseDetail = async () => {
- const res = await getCaseDetailApi({
- caseId: '10086',
- type: '1'
- })
- if (res.type) {
- setCaseDetail(res.data)
- }
- }
+
const getAuthor = async () => {
- const res = await getTabButton({
- caseTaskId: routeData.caseTaskId
- })
+ const res = await getTabButton(caseTaskId)
if (res.type) {
const { tabList } = res.data
+ console.log(tabList, 'tabList1')
setAuthorData(res.data)
if (tabList.length === 0) {
//没有tab就不展示
@@ -139,6 +125,7 @@
})
return flag
}))
+ console.log(tabsList, 'tabsList2')
setTabsActive(tabList[0].id)
}
}
@@ -148,28 +135,27 @@
useEffect(() => {
- // getAuthor();
- // getCase();
- // getLaw();
- // getCaseDetail();
+ getAuthor();
+ getCase();
+ getLaw();
}, [])
return (
- <div style={{ position: 'relative' ,height:'100vh'}}>
+ <div style={{ position: 'relative', height: '100vh' }}>
<NewPage
pageHead={
{ breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
}
>
<Tabs
- defaultActiveTab='1'
+ defaultActiveTab='sxxq'
onChange={(v) => setTabsActive(v)}
className='myTabContent'
>
- {myTab?.map(item => {
+ {tabsList?.map(item => {
return <TabPane
key={item.key}
title={
@@ -191,17 +177,17 @@
</Steps>
</div>
}
- {tabsActive === '1' &&
- <MatterDetail hasApplet={true} hasEditBtn={true} />
+ {tabsActive === 'sxxq' &&
+ <MatterDetail hasApplet={true} hasEditBtn={true} authorData={authorData} caseId={caseId} />
}
{
- tabsActive === '2' && <Typography.Paragraph style={style}>
- <Handle />
+ tabsActive === 'sxbl' && <Typography.Paragraph style={style}>
+ <Handle authorData={authorData} caseId={caseId} caseTaskId={caseTaskId} />
</Typography.Paragraph>
}
{
- tabsActive === '3' && <Typography.Paragraph style={style}>
- <AuditView />
+ tabsActive === 'sqjl' && <Typography.Paragraph style={style}>
+ <AuditView authorData={authorData} />
</Typography.Paragraph>
}
</TabPane>
@@ -217,7 +203,6 @@
onClose={() => setAiQuestionView(false)}
aiData={aiData}
aiLawData={aiLawData}
- caseDetail={caseDetailView}
/>
</div>
)
--
Gitblit v1.8.0