From b731548e050c727c4e05db660dfb64eabc94dbdd Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Fri, 13 Sep 2024 16:35:46 +0800 Subject: [PATCH] fix: bug修改 --- gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 139 +++++++++++++++++++--------------------------- 1 files changed, 57 insertions(+), 82 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..dd74a80 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,30 +84,70 @@ const [caseResultId, setCaseResultId] = useState(''); const [managerName, setManagerName] = useState('') const [progressData, setProgressData] = useState({}); + const [staticButtonList, setStaticButtonList] = useState([]); + const [scannerVisible, setScannerVisible] = useState(false); - - - + const myButton = [ + { + label: '添加办理记录', + type: 'primary', + click: () => addMark(), + key: 'tjbljl', + }, + { + label: '联合处置申请', + type: 'outline', + click: () => uniteHandle(), + key: 'lhczsq', + }, + { + label: '结案申请', + type: 'outline', + click: () => handleCaseResultApply(), + key: 'jasq', + }, + { + label: '督办', + type: 'outline', + click: () => Supervising(), + key: 'db', + status: 'danger' + }, + ] const tabs1 = [ { index: '1', label: '公共模板:提醒尽快启动调解程序督办模板' }, { index: '2', label: '个人模板:推动事件尽快办结督办模板' } ] - const options = [ { value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' } ]; + const content = selectedTab1 === '1' + ? `鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序,并确保案件能够得到及时有效的处理。请您务必于本周内完成以下事项:XX、XX、XX。请确保在事项办理的过程中,遵循公平、公正的原则,并积极促进双方达成共识` + : '1'; + useEffect(() => { + listFeedback(caseId); + getData(caseId) + 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]) const handleCheckedKeys = (userId) => { choosePrincipal(userId) } - - const [scannerVisible, setScannerVisible] = useState(false); const handleConfirm = () => { // 处理确认逻辑 @@ -132,8 +164,6 @@ setScannerVisible(false); }; - - const choosePrincipal = async (id) => { const res = await choosePrincipalApi(caseId, id) if (res.type) { @@ -149,7 +179,6 @@ } } - //删除文件 const handleDelFile = async (id) => { const res = await delFile(id) @@ -157,8 +186,6 @@ $$.infoSuccess({ content: '删除成功!' }); } } - - //新增、编辑办理理由 const saveFeedback = async (submitData) => { @@ -214,8 +241,9 @@ if (type === 'uniteHandle') { setUniteHandleId(res.data) } - if (type === 'addMark') + if (type === 'addMark') { setId(res.data) + } if (type === 'caseResult') { setCaseResultId(res.data) } @@ -266,48 +294,18 @@ setUniteHandleView(!uniteHandleView) } - - const handleTabChange1 = (newTabIndex) => { setSelectedTab1(newTabIndex); }; - - const content = selectedTab1 === '1' - ? `鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序,并确保案件能够得到及时有效的处理。请您务必于本周内完成以下事项:XX、XX、XX。请确保在事项办理的过程中,遵循公平、公正的原则,并积极促进双方达成共识` - : '1'; const handleSupervising = () => { setSupervising(!supervising) } - const handleCaseResultApply = () => { SetCaseResult(!caseResult) getNewTimeId('caseResult') } - - - useEffect(() => { - listFeedback(caseId); - getData(caseId) - 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]) - - return ( <> @@ -425,10 +423,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 +445,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 +567,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