From 5424fb6cc7c907ec12025e96bb41146b28e5582c Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Sun, 08 Sep 2024 10:00:34 +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 | 525 ++++++++++++++++++++------------------------------------- 1 files changed, 187 insertions(+), 338 deletions(-) diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx index 3246d0b..0340129 100644 --- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx +++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx @@ -1,8 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Col, Space, Row, Tooltip } from 'antd'; -import { register, fold, down, empty, link, edit } from '@/assets/images'; -import { knock } from '@/assets/images/icon' -import { Form, Input, Tabs, Typography, Empty, Radio, Button, Modal } from '@arco-design/web-react'; +import { register, aiPerson } from '@/assets/images'; +import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react'; import { question1, } from '@/assets/images'; import ProgressStep from '@/components/ProgressStep/VisitStep'; import SelectObjModal from '@/components/SelectObjModal/selectPerson'; @@ -13,19 +12,16 @@ import CaseResult from './CaseResult' import ArcoUpload from '@/components/ArcoUpload'; import HandleRecord from '../../matterDetail/HandleRecord'; +import SupervisingView from '../../matterDetail/Supervising' +import UniteHandle from '../../matterDetail/UniteHandle'; -const InputSearch = Input.Search; +const Option = Select.Option; const FormItem = Form.Item; const TabPane = Tabs.TabPane; -const RadioGroup = Radio.Group; const appUrl = $$.appUrl; -const style = { - // textAlign: 'center', - // marginTop: 20, -}; const fakeData = [ { @@ -79,9 +75,6 @@ }, ]; -function getByIdRoleApi(id) { - return $$.ax.request({ url: 'ctUser/getByIdRole?id=' + id, type: 'get', service: 'cust' }); -} function choosePrincipalApi(id) { return $$.ax.request({ url: 'caseInfoUnfold/choosePrincipal?caseId=24083010062110001&userId=' + id, type: 'get', service: 'mediate' }); @@ -107,22 +100,35 @@ return $$.ax.request({ url: `caseFeedback/updateFeedback`, type: 'post', service: 'mediate', data }); } +function getFeedbackInfoApi(caseTaskId) { + return $$.ax.request({ url: `caseFeedback/getFeedbackInfo?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' }); +} + +function getByIdRoleApi(id) { + return $$.ax.request({ url: `ctUser/getByIdRole?id=` + id, type: 'get', service: 'cust' }); +} + const Handle = () => { const formRef = useRef(); const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab - - const [wantUser, setWantUser] = useState({}); const [formView, setFormView] = useState(false); const [personView, setPersonView] = useState(false); const [supervising, setSupervising] = useState(false) const [data, setData] = useState({}) + const [feedbackInfoData, setFeedbackInfoData] = useState({}) + const [personData, setPersonData] = useState({}) const [caseResult, SetCaseResult] = useState(false); - const [response, setResponse] = useState('') - const [list, setList] = useState([]) + const [list, setList] = useState([]); + const [mode, SetMode] = useState(false); + const [uniteHandleView, setUniteHandleView] = useState(false); + const [isModalVisible, setIsModalVisible] = useState(false); + const [id, setId] = useState(''); + const [uniteHandleId, setUniteHandleId] = useState(''); + const tabs = [ { index: '1', label: '承办部门' }, @@ -130,16 +136,18 @@ ]; const tabs1 = [ - { index: '1', label: '公共模板1:化解成功结案意见范本' }, - { index: '2', label: '个人模板1:化解成功结案意见范本(完整版)' } + { index: '1', label: '公共模板:提醒尽快启动调解程序督办模板' }, + { index: '2', label: '个人模板:推动事件尽快办结督办模板' } ] + + const options = [ + { value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' } + ]; const tabs2 = [ { index: '1', label: '公共模板1:回复督办内容收到通用范本' }, ] - const [isModalVisible, setIsModalVisible] = useState(false); - const [id, setId] = useState('') const handleTabChange = (newTabIndex) => { setSelectedTab(newTabIndex); @@ -148,73 +156,6 @@ const handleCheckedKeys = (userId) => { choosePrincipal(userId) } - - const [records, setRecords] = useState([ - { - id: 1, - date: '2024 - 7 - 1 10:00', - location: '天河区棠下街综治中心', - remark: '配合部门', - showView: false, - details: [ - { - title: '操作人', - content: ( - <div style={{ display: 'flex' }}> - <div>李晓明</div> - <img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /> - </div> - ), - }, - { - title: '办理意见', - content: ( - <div> - 调解开始,我首先安抚双方情绪,确保对话在一个平和的氛围中展开。随后,我引导王先生详细说明了他的财务困境及还款意愿,同时让银行代表理解其处境,强调长期合作的重要性。经过反复沟通,银行同意调整还款计划,降低利率,并给予王先生一定的宽限期。王先生则承诺按新计划履行还款义务,双方最终达成一致,签署了调解协议。 - </div> - ), - }, - { - title: '办理附件', - content: ( - <a href="your-link-here.html" target="_blank"> - <img src={link} alt="" className="title-file" />江照月法人身份证明.pdf - </a> - ), - }, - ], - }, - { - id: 2, - date: '2024 - 7 - 2 14:00', - location: '天河区天河南街道办事处', - remark: '承办部门', - showView: false, - details: [ - { - title: '操作人', - content: ( - <div style={{ display: 'flex' }}> - <div>张伟</div> - <img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /> - </div> - ), - }, - { - title: '办理意见', - content: ( - <div> - 在本次协调会议中,我们成功解决了双方之间的纠纷,确保了所有参与方的利益得到了妥善处理。通过深入交流,各方达成了共识,同意采取一系列措施来解决现存的问题。 - </div> - ), - }, - { - title: '办理附件', - content: '广州市天河区天河南路200号', - }, - ], - }, - ]); const [scannerVisible, setScannerVisible] = useState(false); @@ -232,14 +173,6 @@ setScannerVisible(true); }; - const getByIdRole = async () => { - const res = await getByIdRoleApi('2105180249501982') - if (res.type) { - let data = res.data - setData(data) - } - - } const choosePrincipal = async (id) => { console.log(id, 'choosePrincipalId') @@ -248,6 +181,12 @@ let data = res.data console.log(data, 'choosePrincipalchoosePrincipal') } + + } + + const getByIdRole = async () => { + const res = await getByIdRoleApi('2105180249501982') + setPersonData(res.data) } @@ -260,18 +199,12 @@ } } - //获取理由id - const getNewTimeId = async () => { - const res = await getNewTimeIdApi() - if (res.type) { - setId(res.data) - } - } + //新增、编辑办理理由 const saveFeedback = async (submitData) => { console.log(submitData, 'submitData1111') - if(submitData.id) { + if (submitData.id) { //编辑 const res = await updateFeedbackApi({ ...submitData, @@ -283,7 +216,7 @@ } else { const res = await saveFeedbackApi({ ...submitData, - caseId: '24083010062110001', + caseId: "24083010062110001", id: id, caseTaskId: '', }) @@ -292,6 +225,12 @@ listFeedback('24083010062110001') } } + } + + const getFeedbackInfo = async () => { + const res = await getFeedbackInfoApi('24083010062110001') + setFeedbackInfoData(res.data) + console.log(res.data, 'res.data') } //获取办理记录接口 @@ -303,12 +242,24 @@ } } + //获取理由id + const getNewTimeId = async (type) => { + const res = await getNewTimeIdApi() + if (res.type) { + if (type === 'uniteHandle') { + setUniteHandleId(res.data) + } + if (type === 'addMark') + setId(res.data) + } + } + //添加办理记录 const addMark = () => { setFormView(!formView); - getNewTimeId() + getNewTimeId('addMark') } - + //保存信息 const handleFinish = () => { let submitData = formRef.current.getFields() @@ -328,6 +279,13 @@ setSupervising(!supervising) } + const uniteHandle = () => { + getNewTimeId('uniteHandle') + setUniteHandleView(!uniteHandleView) + } + + + const handleTabChange1 = (newTabIndex) => { setSelectedTab1(newTabIndex); }; @@ -340,14 +298,16 @@ setSupervising(!supervising) } - const handleResponse = () => { - setResponse(!response) + const handlePersonView = () => { + setPersonView(!personView) + } useEffect(() => { listFeedback('24083010062110001'); - // getByIdRole() + getFeedbackInfo(); + getByIdRole(); }, []) @@ -363,22 +323,22 @@ <Row gutter={[16, 16]}> <Col span={8} style={{ display: 'flex' }}> <div><div className="title-text">承办部门:</div></div> - <div>天河区棠下街综治中心</div> + <div>{feedbackInfoData?.handleUnitName}</div> </Col> <Col span={8} style={{ display: 'flex' }}> <div><div className="title-text">经办人:</div></div> <div style={{ display: 'flex' }}> - <div>王一顺</div> - <img onClick={() => setPersonView(!personView)} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /> + <div>{feedbackInfoData?.handleUserName}</div> + <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /> </div> </Col> <Col span={8} style={{ display: 'flex' }}> <div><div className="title-text">配合部门:</div></div> - <div>-</div> + <div>{feedbackInfoData?.assistUnitName}</div> </Col> <Col span={8} style={{ display: 'flex' }}> <div><div className="title-text">受理时间:</div></div> - <div>2024-7-5 11:45</div> + <div>{feedbackInfoData?.acceptTime}</div> </Col> </Row> @@ -409,13 +369,6 @@ <WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} /> : <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button> - // <InputSearch - // searchButton='选择' - // placeholder='请选择' - // style={{ width: 350 }} - // onClick={() => setIsModalVisible(true)} - // onSearch={() => setIsModalVisible(true)} - // /> } </FormItem> </Col> @@ -423,77 +376,77 @@ <div style={{ color: 'rgb(134, 144, 156)' }}>办理记录</div> <HandleRecord isReview={false} handleEdit={handleEdit} data={list} /> {/* {formView && */} - <div className='Form' style={{display: formView ? '' : 'none'}}> - <Col span={24} style={{ marginBottom: '8px' }}> - <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>添加办理记录</h5> - </Space> - </Col> - <Col span={24}> - <Form - ref={formRef} - layout='vertical' - requiredSymbol={false} - scrollToFirstError={true} - > - <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> - } - field='handleContent' - rules={[{ message: '请填写事项概况', required: true }]} - > - <Input.TextArea - maxLength={200} - showWordLimit - rows={5} - placeholder='请完整描述事项概况,应具备5要素:发生时间+发生地点+人物情况+事项起因+事项经过' - wrapperStyle={{ width: '100%' }} - /> - </FormItem> - - </Col> - <Col span={24}> - <FormItem - label={<div style={{ display: 'flex' }}> - 办理附件 - </div> - } - field='caseDes' - rules={[{ message: '请填写事项概况', required: true }]} - > - <ArcoUpload - params={{ - action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-102`, - }} - field='file1' - // handleChangeFile={handleChangeFile} - label='' - // editData={props.editData} - handleDelFile={handleDelFile} - /> - </FormItem> - </Col> - - </Row> - </Form> - </Col> - <Space size='middle'> - <Button type='primary' onClick={() => handleFinish()}>保存</Button> - <Button type='secondary' onClick={() => { setFormView(!formView); }}>取消添加</Button> + <div className='Form' style={{ display: formView ? '' : 'none' }}> + <Col span={24} style={{ marginBottom: '8px' }}> + <Space size='small'> + <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>添加办理记录</h5> </Space> - </div> + </Col> + <Col span={24}> + <Form + ref={formRef} + layout='vertical' + requiredSymbol={false} + scrollToFirstError={true} + > + <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> + } + field='handleContent' + rules={[{ message: '请填写事项概况', required: true }]} + > + <Input.TextArea + maxLength={200} + showWordLimit + rows={5} + placeholder='请完整描述事项概况,应具备5要素:发生时间+发生地点+人物情况+事项起因+事项经过' + wrapperStyle={{ width: '100%' }} + /> + </FormItem> + + </Col> + <Col span={24}> + <FormItem + label={<div style={{ display: 'flex' }}> + 办理附件 + </div> + } + field='caseDes' + rules={[{ message: '请填写事项概况', required: true }]} + > + <ArcoUpload + params={{ + action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${'24083010062110001'}&ownerId=${id}&ownerType=${'22_00018-501'}`, + }} + field='file1' + // handleChangeFile={handleChangeFile} + label='' + // editData={props.editData} + handleDelFile={handleDelFile} + /> + </FormItem> + </Col> + + </Row> + </Form> + </Col> + <Space size='middle'> + <Button type='primary' onClick={() => handleFinish()}>保存</Button> + <Button type='secondary' onClick={() => { setFormView(!formView); }}>取消添加</Button> + </Space> + </div> {/* } */} </Col> </Form> <Space style={{ marginTop: '38px', bottom: '4px' }}> <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button> - <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>联合处置申请</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={() => SetCaseResult(!caseResult)}>结案申请</Button> <Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button> <Button type='secondary'>返回上级页面</Button> @@ -543,39 +496,7 @@ } > <Typography.Paragraph> - <RadioGroup - type='button' - name='lang' - defaultValue='1' - style={{ display: 'flex', margin: '0 16px 0px 16px', }} - > - <Radio value='1' style={{ flex: 1, textAlign: 'center' }}>未回复</Radio> - <Radio value='2' style={{ flex: 1, textAlign: 'center' }}>已回复</Radio> - </RadioGroup> - <div className='Supervising'> - <div style={{ display: 'flex' }}> - <img src={knock} alt='' style={{ marginRight: '4px' }} /> - <div style={{ color: '#EF6C24' }} >回复期限剩3小时</div> - </div> - <div className='Supervising-item'> - <div className='Supervising-item-title'>督办时间:</div> - <div>2024-7-12 10:50</div> - </div> - <div className='Supervising-item'> - <div className='Supervising-item-title'>督办人:</div> - <div>张三丰</div> - </div> - <div className='Supervising-item'> - <div className='Supervising-item-title'>督办内容:</div> - <div>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div> - </div> - <div className='Supervising-item'> - <div className='Supervising-item-title'>督办附件:</div> - <img src={link} alt='' style={{ width: '16px' }} /> - <div>2</div> - </div> - <Button className='Supervising-btn' size='small' type='outline' onClick={() => handleResponse()}>回复</Button> - </div> + <SupervisingView id={id} /> </Typography.Paragraph> </TabPane> </Tabs> @@ -605,27 +526,27 @@ <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>{data.trueName}</div></div></td> + <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'>{data.acc}</td> + <td width='380'>{personData?.acc}</td> </tr> <tr> <th bgcolor="#F7F8FA" className="table-title">手机号码</th> - <td>{data.mobile}</td> + <td>{personData?.mobile}</td> <th bgcolor="#F7F8FA" className="table-title">工作电话</th> - <td>020-83002020</td> + <td>-</td> </tr> <tr> <th bgcolor="#F7F8FA" className="table-title">所属部门</th> - <td>{data.deptName}</td> + <td>{personData?.deptName}</td> <th bgcolor="#F7F8FA" className="table-title">职务</th> - <td>主任</td> + <td>{personData?.userRoles}</td> </tr> </table> </Modal> <Modal visible={supervising} onCancel={() => setSupervising(false)} title='督办' centered footer={null}> - <div style={{ marginTop: '18px' }}>督办意见</div> <Form + ref={formRef} layout='vertical' requiredSymbol={false} scrollToFirstError={true} @@ -636,24 +557,47 @@ <Row> <Col span={24}> <FormItem + label={<div style={{ display: 'flex' }}><div>督办部门</div><div style={{ color: '#86909C' }}>(可多选)</div></div>} + field='' + > + <Select + mode='multiple' + placeholder='请选择督办部门' + style={{}} + allowClear + > + {options.map((option) => ( + <Option key={option.value} value={option.value} onChange={(v) => console.log(v, 'vvvvvv')}> + {option.label} + </Option> + ))} + </Select> + </FormItem> + </Col> + <div style={{ marginBottom: '8px' }}>督办意见</div> + <Col span={24}> + <FormItem field='suggestion' > - <div className='tabs1'> - {tabs1.map((tab) => ( - <div - key={tab.index} - style={{ - color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)', - border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`, - borderRadius: '2px', - cursor: 'pointer', - padding: '0px 8px', - }} - onClick={() => handleTabChange1(tab.index)} - > - {tab.label} - </div> - ))} + <div style={{ display: 'flex', justifyContent: 'space-between' }}> + <div className='tabs1'> + {tabs1.map((tab) => ( + <div + key={tab.index} + style={{ + color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)', + border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`, + borderRadius: '2px', + cursor: 'pointer', + padding: '0px 8px', + }} + onClick={() => handleTabChange1(tab.index)} + > + {tab.label} + </div> + ))} + </div> + <div style={{ color: '#1A6FB8' }} onClick={() => SetMode(!mode)}>更多模板</div> </div> <Input.TextArea rows={5} @@ -684,102 +628,7 @@ </Row> </Form> </Modal> - <Modal visible={response} onCancel={() => setResponse(false)} title='回复督办' centered footer={null} style={{ overflowY: 'auto' }}> - <div style={{}}> - <Col span={24} style={{ marginBottom: '8px' }}> - <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>督办意见</h5> - </Space> - </Col> - <Row gutter={[16, 16]}> - <Col span={24} > - <div className="title-text">督办时间</div> - <div>2024-7-12 10:50</div> - </Col> - <Col span={24}> - <div className="title-text">督办人</div> - <div>张三丰</div> - </Col> - <Col span={24}> - <div className="title-text">督办内容</div> - <div>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div> - </Col> - <Col span={24}> - <div className="title-text">督办附件</div> - <img src={link} alt="" className="title-file" />广东好又多贸易有限公司营业执照副本.pdf - </Col> - </Row> - <Col span={24} style={{ marginBottom: '8px' }}> - <Space size='small'> - <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>督办回复</h5> - </Space> - </Col> - <Form - layout='vertical' - requiredSymbol={false} - scrollToFirstError={true} - initialValues={{ - suggestion: '' - }}//默认值 - > - <Row> - <Col span={24}> - <FormItem - field='suggestion' - > - <div> - - </div> - <div className='tabs1'> - {tabs2.map((tab) => ( - <div - key={tab.index} - style={{ - color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)', - border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`, - borderRadius: '2px', - cursor: 'pointer', - padding: '0px 8px', - }} - onClick={() => handleTabChange1(tab.index)} - > - {tab.label} - </div> - ))} - </div> - <div>更多模板</div> - - <Input.TextArea - rows={5} - wrapperStyle={{ width: '700px' }} - value={content} - /> - </FormItem> - </Col> - <Col span={24}> - <FormItem - label='附件材料' - field='caseDes' - rules={[{ message: '请填写事项概况', required: true }]} - > - <ArcoUpload - params={{ - action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-102`, - }} - field='file1' - // handleChangeFile={handleChangeFile} - label='' - // editData={props.editData} - handleDelFile={handleDelFile} - /> - </FormItem> - </Col> - <Button type='primary' style={{ marginTop: '-16px', marginBottom: '16px' }} onClick={() => handleSupervising()}>提交</Button> - </Row> - </Form> - </div> - </Modal> - + <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} /> <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} /> </div> -- Gitblit v1.8.0