From db35bd251144da64188dfb8fca63a4fd8c0f5973 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Fri, 30 Aug 2024 17:50:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/visit/index.jsx | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 371c7df..8a3be63 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -39,7 +39,7 @@
const formRef = useRef();
const [isReview, setIsReview] = useState(false);//预览页面控制
- const [current, setCurrent] = useState(1);
+ const [current, setCurrent] = useState(2);
const [tabsActive, setTabsActive] = useState('1');
const [tabsList, setTabList] = useState([
{
@@ -56,6 +56,7 @@
])
const breadcrumbDataMap = {
1: { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' },
+ 2: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' },
3: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
}
@@ -95,7 +96,14 @@
return {
...newObj,
personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"),
- agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2"),
+ agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => {
+ //personNameList用于查看详情显示代理人名字，不需要上传，去除
+ const { personNameList, ...rest } = item
+ return {
+ ...rest,
+ personId: item.personId.join(',')
+ }
+ }),
}
} else {
const res = await getId()
@@ -103,7 +111,14 @@
return {
...newObj,
personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"),
- agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2"),
+ agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => {
+ //personNameList用于查看详情显示代理人名字，不需要上传，去除
+ const { personNameList, ...rest } = item
+ return {
+ ...rest,
+ personId: item.personId.join(',')
+ }
+ }),
id: res.data
}
}
@@ -164,7 +179,8 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- {isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
+ <Preview style={{ display: isReview ? '' : 'none' }} />
+ <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} />
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
@@ -177,7 +193,7 @@
</Fragment>
}
{
- current === 3 &&
+ (current === 2 || current === 3) &&
<Tabs defaultActiveTab='1' onChange={(v) => setTabsActive(v)}>
{tabsList?.map(item => {
return <TabPane
@@ -201,7 +217,7 @@
</Steps>
</div>
}
- <MattersInfo active={tabsActive} />
+ <MattersInfo active={tabsActive} current={current}/>
</TabPane>
})}
</Tabs>
--
Gitblit v1.8.0