From 91ec7b059b0280c61c43881ec79af093c030e79f Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 28 Aug 2024 14:05:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/visit/index.jsx | 83 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index af13020..5ab6711 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-23 15:49:08
+ * @LastEditTime: 2024-08-27 20:05:31
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -17,6 +17,7 @@
import { Button, Steps } from '@arco-design/web-react';
import VisitorRegister from './component/visitorRegister';
import Preview from './preview';
+import MattersInfo from './component/MattersInfo';
const Step = Steps.Step;
@@ -72,7 +73,7 @@
okText: '确定受理',
cancelText: '我再想想',
onOk: async () => {
- console.log('1111111')
+ setTabsActive('2')
},
});
@@ -86,41 +87,55 @@
return (
<div style={{ position: 'relative' }}>
- <NewPage
- pageHead={
- { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' }
- }
- >
- {/*onChange={(activeKey) => setTabsActive(activeKey)}*/}
- <RegisterTab tabs={tabs} activeKey={tabsActive} style={{ background: '#fff' }} />
- {/* <div style={{backgroundColor: '#fff',margin:'12px 16px 0px 16px',paddingTop:'16px',paddingLeft:'91px'}}>
- <Steps type='navigation' current={current} onChange={setCurrent} style={{ }}>
- <Step title='来访登记' style={{ color: '#1A6FB8' }} disabled/>
- <Step title='事件流转' disabled/>
- <Step title='办理反馈' disabled/>
- <Step title='结案审核' disabled/>
- <Step title='当事人评价' disabled/>
- <Step title='结案归档' disabled/>
- </Steps>
+ {tabsActive !== '2' &&
- </div> */}
- {current === 1 &&
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' }
+ }
+ >
+ {/*onChange={(activeKey) => setTabsActive(activeKey)}*/}
+
+ {/* <RegisterTab tabs={tabs} activeKey={tabsActive} style={{ background: '#fff' }} /> */}
+
+ <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
+ <Steps type='navigation' current={current} onChange={setCurrent} style={{}}>
+ <Step title='来访登记' disabled />
+ <Step title='事件流转' disabled />
+ <Step title='办理反馈' disabled />
+ <Step title='结案审核' disabled />
+ <Step title='当事人评价' disabled />
+ <Step title='结案归档' disabled />
+ </Steps>
+
+ </div>
+ {tabsActive === '1' &&
+ <Fragment>
+ {isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
+ <div className="dataSync-excel">
+ <Space size="large" style={{ margin: '4px 14px' }}>
+ <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
+ <Button type='secondary' onClick={handleReview}>返回上级页面</Button>
+ </Space>
+ </div>
+ </Fragment>
+ }
+ </NewPage>
+ }
+ {tabsActive === '2' &&
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
+ }
+ >
<Fragment>
- {isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
- <div className="dataSync-excel">
- <Space size="large" style={{ margin: '4px 14px' }}>
- <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
- <Button type='secondary' onClick={handleReview}>返回上级页面</Button>
- </Space>
- </div>
+ <MattersInfo />
</Fragment>
- }
- {/* {preview && <Preview />} */}
- </NewPage>
-
+ </NewPage>
+ }
</div>
)
}
--
Gitblit v1.8.0