From 3ae864f005e8a874de01c15e14b83196a3f6f11b Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Wed, 18 Sep 2024 10:21:30 +0800 Subject: [PATCH] 新增一个测试环境 --- gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 235 +++++++++++++++++++++------------------------------------- 1 files changed, 85 insertions(+), 150 deletions(-) diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx index 195c86e..dd74a80 100644 --- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx +++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx @@ -17,16 +17,10 @@ import UniteHandle from '../../matterDetail/UniteHandle'; import { useNavigate } from 'react-router-dom'; - 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' }); @@ -64,11 +58,14 @@ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=` + caseId, type: 'get', service: 'mediate' }); } +//删除经办人 +function deletePrincipalApi(caseId) { + return $$.ax.request({ url: `caseInfoUnfold/deletePrincipal?caseId=` + caseId, type: 'get', service: 'mediate' }); +} const Handle = ({ authorData, caseTaskId, caseId }) => { const formRef = useRef(); const navigate = useNavigate(); - const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab const [wantUser, setWantUser] = useState({}); const [formView, setFormView] = useState(false); @@ -87,45 +84,85 @@ 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 = () => { // 处理确认逻辑 setScannerVisible(false); }; + const handleWantUserClose = () => { + setWantUser({ wantUserId: null, wantUserName: null }) + deletePrincipalApi(caseId) + } + const handleCancel = () => { // 处理取消逻辑 setScannerVisible(false); }; - - const openScanner = () => { - setScannerVisible(true); - }; - const choosePrincipal = async (id) => { const res = await choosePrincipalApi(caseId, id) @@ -142,7 +179,6 @@ } } - //删除文件 const handleDelFile = async (id) => { const res = await delFile(id) @@ -150,8 +186,6 @@ $$.infoSuccess({ content: '删除成功!' }); } } - - //新增、编辑办理理由 const saveFeedback = async (submitData) => { @@ -183,8 +217,9 @@ const getFeedbackInfo = async () => { const res = await getFeedbackInfoApi(caseId) if (res.type) { - setFeedbackInfoData(() => res.data) - // getByIdRole(); + let data = res.data; + setFeedbackInfoData(data); + setWantUser({ wantUserName: data?.handleUserName }) } } @@ -206,8 +241,9 @@ if (type === 'uniteHandle') { setUniteHandleId(res.data) } - if (type === 'addMark') + if (type === 'addMark') { setId(res.data) + } if (type === 'caseResult') { setCaseResultId(res.data) } @@ -222,19 +258,6 @@ } - - const handleSubmit = async () => { - if (formRef.current) { - formRef.current.validate(undefined, (errors, values) => { - if (!errors) { - const params = formRef.current.getFields() - - } - }); - } - } - - //添加办理记录 const addMark = () => { setFormView(!formView); @@ -244,14 +267,14 @@ //保存信息 const handleFinish = () => { if (formRef.current) { - formRef.current.validate(undefined, (errors, values) => { - if (!errors) { + formRef.current.validate(undefined, (errors, values) => { + if (!errors) { let submitData = formRef.current.getFields() saveFeedback(submitData) setFormView(!formView); - } - }); - } + } + }); + } } //点击编辑办理事由 @@ -271,23 +294,12 @@ setUniteHandleView(!uniteHandleView) } - - const handleTabChange1 = (newTabIndex) => { setSelectedTab1(newTabIndex); }; - const content = selectedTab1 === '1' - ? `鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序,并确保案件能够得到及时有效的处理。请您务必于本周内完成以下事项:XX、XX、XX。请确保在事项办理的过程中,遵循公平、公正的原则,并积极促进双方达成共识` - : '1'; - const handleSupervising = () => { setSupervising(!supervising) - } - - const handlePersonView = () => { - getByIdRole(); - } const handleCaseResultApply = () => { @@ -295,36 +307,13 @@ 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 ( <> <div className='container' style={{ height: 'calc(-307px + 100vh)' }}> <div className='container-top'> <Col span={24}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理信息</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>办理信息</h4> </Space> </Col> <Row gutter={[16, 16]}> @@ -334,13 +323,12 @@ </Col> <Col span={8} style={{ display: 'flex' }}> <div><div className="title-text">经办人:</div></div> - <div style={{ display: 'flex' }}> + <div style={{ marginTop: '-4px' }}> { - feedbackInfoData?.handleUserName ? + wantUser.wantUserName ? <> - <div>{feedbackInfoData?.handleUserName}</div> - <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /> - </> : + <WantUserTag name={wantUser.wantUserName} onClose={() => handleWantUserClose()} /> </> + : <Button onClick={() => { setIsModalVisible(true); }} style={{ color: '#1A6FB8', marginTop: '-2px' }} type='outline'>选择</Button> } </div> @@ -361,7 +349,7 @@ <div className='container-bottom-left'> <Col span={24} style={{}}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理反馈</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>办理反馈</h4> </Space> </Col> <Form @@ -372,10 +360,10 @@ <Col span={24}> <HandleRecord isReview={false} handleEdit={handleEdit} data={list} /> {/* {formView && */} - <div className='Form' style={{ display: formView ? '' : 'none' }}> + <div className='Form' style={{ display: formView ? '' : 'none', marginBottom: '50px' }}> <Col span={24} style={{ marginBottom: '8px' }}> <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>添加办理记录</h5> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>添加办理记录</h4> </Space> </Col> <Col span={24}> @@ -388,19 +376,14 @@ <Row gutter={[32, 0]}> <Col span={24}> <FormItem - label={<div style={{ display: 'flex' }}> - 办理意见 - <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} /> - <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={openScanner}>识别材料</div> - </div> - } + label={(<div style={{ display: 'flex' }}>办理意见<div className="must">必填</div></div>)} field='handleContent' rules={[{ message: '请填写办理意见', required: true }]} > <Input.TextArea maxLength={200} showWordLimit - rows={5} + rows={7} placeholder='办理意见应该填写完整,办理意见应具备5要素:调解时间+调解参与部门/人+调解地点+调解过程+调解结果' wrapperStyle={{ width: '100%' }} /> @@ -438,18 +421,15 @@ {/* } */} </Col> </Form> - {!formView && <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> - - } </div> <div className='container-bottom-right'> <Tabs defaultActiveTab='1' className='tabs-container' > @@ -462,32 +442,9 @@ } > <Typography.Paragraph> - <div className='progress' style={{ paddingBottom: '16px' }}> + <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 @@ -526,28 +483,6 @@ onConfirm={handleConfirm} onCancel={handleCancel} /> - <Modal visible={personView} onCancel={() => setPersonView(false)} title='工作人员信息' centered footer={null}> - <table border="1" align="center" cellpadding="5" className="table"> - <tr> - <th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th> - <td width='380'><div style={{ display: 'flex' }}><div>{personData?.trueName}</div></div></td> - <th bgcolor="#F7F8FA" className="table-title" width="120">登录账号</th> - <td width='380'>{personData?.acc}</td> - </tr> - <tr> - <th bgcolor="#F7F8FA" className="table-title">手机号码</th> - <td>{personData?.mobile}</td> - <th bgcolor="#F7F8FA" className="table-title">工作电话</th> - <td>-</td> - </tr> - <tr> - <th bgcolor="#F7F8FA" className="table-title">所属部门</th> - <td>{personData?.unitName}</td> - <th bgcolor="#F7F8FA" className="table-title">职务</th> - <td>{personData?.userRoles}</td> - </tr> - </table> - </Modal> <Modal visible={supervising} onCancel={() => setSupervising(false)} title='督办' centered footer={null}> <Form ref={formRef} @@ -632,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