From cf88306b1f6aade9f0c6c4fa5859872d3f177c4a Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 13 Sep 2024 14:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 106 ++++++++++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 58 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 15b58f3..c6b887f 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -16,19 +16,11 @@
import SupervisingView from '../../matterDetail/Supervising'
import UniteHandle from '../../matterDetail/UniteHandle';
import { useNavigate } from 'react-router-dom';
-import MyUpload from '@/components/MyUpload';
-
-
const Option = Select.Option;
const FormItem = Form.Item;
const TabPane = Tabs.TabPane;
const appUrl = $$.appUrl;
-
-
-
-
-
function choosePrincipalApi(caseId, userId) {
return $$.ax.request({ url: `caseInfoUnfold/choosePrincipal?caseId=${caseId}&userId=` + userId, type: 'get', service: 'mediate' });
@@ -92,9 +84,34 @@
const [caseResultId, setCaseResultId] = useState('');
const [managerName, setManagerName] = useState('')
const [progressData, setProgressData] = useState({});
+ const [staticButtonList, setStaticButtonList] = useState([])
-
-
+ const myButton = [
+ {
+ label: '添加办理记录',
+ type: 'primary',
+ click: () => addMark(),
+ key: 'tjbljl',
+ },
+ {
+ label: '联合处置申请',
+ type: 'outline',
+ click: () => uniteHandle(),
+ key: 'lhczsq',
+ },
+ {
+ label: '结案申请',
+ type: 'outline',
+ click: () => uniteHandle(),
+ key: 'jasq',
+ },
+ {
+ label: '督办',
+ type: 'outline',
+ click: () => Supervising(),
+ key: 'db',
+ },
+ ]
const tabs1 = [
{ index: '1', label: '公共模板：提醒尽快启动调解程序督办模板' },
@@ -104,12 +121,6 @@
const options = [
{ value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' }
];
-
-
-
-
-
-
const handleCheckedKeys = (userId) => {
choosePrincipal(userId)
@@ -214,8 +225,9 @@
if (type === 'uniteHandle') {
setUniteHandleId(res.data)
}
- if (type === 'addMark')
+ if (type === 'addMark') {
setId(res.data)
+ }
if (type === 'caseResult') {
setCaseResultId(res.data)
}
@@ -293,19 +305,20 @@
getFeedbackInfo();
}, [])
- // useEffect(() => {
- // if (authorData) {
- // const { buttonList } = authorData;
- // setStaticButtonList(myButton.filter(item => {
- // const flag = buttonList.some(result => {
- // if (result.id === item.key) {
- // return true
- // }
- // })
- // return flag
- // }))
- // }
- // }, [authorData])
+ useEffect(() => {
+ if (authorData) {
+ const { buttonList } = authorData;
+ setStaticButtonList(myButton.filter(item => {
+ const flag = buttonList.some(result => {
+ if (result.id === item.key) {
+ return true
+ }
+ })
+ return flag
+ }))
+ console.log(buttonList, myButton);
+ }
+ }, [authorData])
@@ -425,10 +438,10 @@
</Form>
<div className="dataSync-excel">
<Space size="middle" style={{ margin: '4px 14px' }}>
- <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => handleCaseResultApply()} >结案申请</Button>
- <Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
+ {staticButtonList?.map(item => {
+ const { label, key, click, ...rest } = item;
+ return <Button key={key} onClick={click} {...rest} >{label}</Button>
+ })}
<Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
@@ -447,29 +460,6 @@
<div className='progress' style={{ paddingBottom: '16px', marginTop: '0px' }} >
<ProgressStep progressData={progressData} hasTab={true} />
</div>
-
- {/* <div style={{ display: 'flex', marginLeft: '16px', gap: '16px' }}>
- {tabs.map((tab) => (
- <div
- key={tab.index}
- style={{
- color: selectedTab === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)',
- padding: '6px 12px',
- border: `1px solid ${selectedTab === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`,
- borderRadius: '4px',
- cursor: 'pointer',
- }}
- onClick={() => handleTabChange(tab.index)}
- >
- {tab.label}
- </div>
- ))}
- </div>
- {selectedTab === '1' &&
- <div className='progress'>
- <ProgressStep progressData={fakeData} />
- </div>
- } */}
</Typography.Paragraph>
</TabPane>
<TabPane
@@ -592,7 +582,7 @@
</Row>
</Form>
</Modal>
- <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
+ <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} caseId={caseId} caseTaskId={caseTaskId} />
<CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId} />
</div>
--
Gitblit v1.8.0