From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Thu, 05 Sep 2024 21:11:53 +0800 Subject: [PATCH] 合并冲突 --- gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 541 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 338 insertions(+), 203 deletions(-) diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx index b2ebf37..89dd7ac 100644 --- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx +++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx @@ -2,29 +2,27 @@ 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 { Form, Input, Tabs, Typography, Empty, Radio, 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'; import WantUserTag from '@/components/WantUserTag/Handling'; import { scan } from '@/assets/images/icon' -import DocumentScanner from './FileUpLoad' +import DocumentScanner from '../../matterDetail/FileUpLoad'; import * as $$ from '@/utils/utility'; import CaseResult from './CaseResult' import ArcoUpload from '@/components/ArcoUpload'; +import HandleRecord from '../../matterDetail/HandleRecord'; +import TableView from '@/components/TableView'; -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 = [ { @@ -102,6 +100,9 @@ return $$.ax.request({ url: `caseFeedback/listFeedback?id=` + id, type: 'get', service: 'mediate' }); } +function updateFeedbackApi(data) { + return $$.ax.request({ url: `caseFeedback/updateFeedback`, type: 'post', service: 'mediate', data }); +} @@ -118,7 +119,11 @@ const [data, setData] = useState({}) const [caseResult, SetCaseResult] = useState(false); const [response, setResponse] = useState('') - const [list, setList] = useState([]) + const [list, setList] = useState([]); + const [mode, SetMode] = useState(false); + const [modeDetail, setModeDetail] = useState(false); + const [radioValue, setRadioValue] = useState('') + const [detail, setDetail] = useState(false); const tabs = [ { index: '1', label: '承办部门' }, @@ -126,9 +131,13 @@ ]; 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:回复督办内容收到通用范本' }, @@ -145,96 +154,105 @@ choosePrincipal(userId) } - const [records, setRecords] = useState([ + const fakeColumns = [ + { + title: '序号', + dataIndex: 'caseNo', + key: 'caseNo', + width: 51, + render: (text, record, index) => <span>{index + 1}</span>, + }, + { + title: '类型', + dataIndex: 'judicNo', + key: 'judicNo', + width: 85, + + }, + { + title: '模板名称', + dataIndex: 'inputUserName', + key: 'perClassName', + width: 160, + render: (text) => ( + <> + {text} + {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */} + </> + ) + + + }, + { + title: '模板内容', + dataIndex: 'perClassName', + key: 'perClassName', + width: 400, + render: (text) => ( + <div style={{}}> + <div style={{ width: '300px', height: '40px', overflow: 'hidden', display: 'flex', whiteSpace: 'pre-line' }}>{text}</div> + <div style={{ color: '#1A6FB8', marginTop: '4px' }} onClick={() => setModeDetail(true)}>...查看更多</div> + </div> + ) + + }, + { + title: '操作', + dataIndex: 'perClassName', + key: 'perClassName', + width: 53, + render: (text) => ( + <div style={{ color: '#1A6FB8' }}>使用</div> + ) + }, + // 更多列配置... + ]; + const fakeData1 = [ { 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> - ), - }, - ], + caseNo: 'A20230101', + judicNo: '公共模板', + perClassName: '鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序[事项1......][事项2......]', + inputUserName: '尽快启动调解程序督办', + mediateUserName: '2024-7-12 12:00', + judgeName: '王五', + mediator: '赵六', + handlerUserName: '钱七', + returnUserName: '孙八', + expireTime: '2023-08-10T08:00:00.000Z', + processName: '进行中', + otherMediator: '周九', + canalName: '网络', + judicResult: '通过', + assistName: '吴十', + mediTypeName: '民事调解', + serieStatus: '1', // 1 表示非系列案,2 表示系列案 + // 更多字段... }, { 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号', - }, - ], + caseNo: 'A20230101', + judicNo: '个人模板', + perClassName: '鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序[事项1......][事项2......]', + inputUserName: '尽快启动调解程序督办', + mediateUserName: '2024-7-12 12:00', + judgeName: '王五', + mediator: '赵六', + handlerUserName: '钱七', + returnUserName: '孙八', + expireTime: '2023-08-10T08:00:00.000Z', + processName: '进行中', + otherMediator: '周九', + canalName: '网络', + judicResult: '通过', + assistName: '吴十', + mediTypeName: '民事调解', + serieStatus: '1', // 1 表示非系列案,2 表示系列案 + // 更多字段... }, - ]); - - - const toggleView = (id) => { - setList(list.map(record => { - if (record.id === id) { - return { - ...record, - showView: !record.showView, - }; - } - return record; - })); - }; - - const handleEdit = (id) => { - console.log(id, 'handleEdit') - let handleContent = list.find(item => item.id = id).handleContent - setList(list.filter(record => record.id !== id)); - setFormView(!formView); - formRef.current.setFieldsValue({ - handleContent: handleContent - }) - } + // 更多数据... + ]; const [scannerVisible, setScannerVisible] = useState(false); @@ -281,6 +299,7 @@ } } + //获取理由id const getNewTimeId = async () => { const res = await getNewTimeIdApi() if (res.type) { @@ -288,33 +307,60 @@ } } + //新增、编辑办理理由 const saveFeedback = async (submitData) => { console.log(submitData, 'submitData1111') - const res = await saveFeedbackApi(submitData) - if (res.type) { - $$.infoSuccess({ content: '保存成功' }); + if(submitData.id) { + //编辑 + const res = await updateFeedbackApi({ + ...submitData, + }) + if (res.type) { + $$.infoSuccess({ content: '修改成功' }); + listFeedback('24083010062110001') + } + } else { + const res = await saveFeedbackApi({ + ...submitData, + caseId: '24083010062110001', + id: id, + caseTaskId: '', + }) + if (res.type) { + $$.infoSuccess({ content: '保存成功' }); + listFeedback('24083010062110001') + } } } + //获取办理记录接口 const listFeedback = async (id) => { const res = await listFeedbackApi(id) if (res.type) { let data = res.data.caseFeedbackList setList(data) } - console.log(list, 'listFeedbackApilistFeedbackApi') } + //添加办理记录 const addMark = () => { setFormView(!formView); getNewTimeId() } - + + //保存信息 const handleFinish = () => { - console.log(formRef.current.getFields(), formRef, 'formRef.current.getFields()', 'formRef') let submitData = formRef.current.getFields() saveFeedback(submitData) setFormView(!formView); + } + + //点击编辑办理事由 + const handleEdit = (record) => { + setFormView(true) + formRef.current.setFieldsValue({ + ...record + }) } const Supervising = () => { @@ -335,6 +381,10 @@ const handleResponse = () => { setResponse(!response) + } + + const handleUse = () => { + setModeDetail(!modeDetail) } @@ -414,59 +464,9 @@ </Col> <Col span={24}> <div style={{ color: 'rgb(134, 144, 156)' }}>办理记录</div> - {list?.length > 0 ? - <div> - {list?.map(record => ( - <div key={record.id} className='container-bottom-left-record'> - <div className='container-bottom-left-record-top'> - { - record.showView ? ( - <img src={down} alt='' style={{ width: '18px', marginRight: '6px' }} onClick={() => toggleView(record.id)} /> - ) : ( - <img src={fold} alt='' className='container-bottom-left-record-top-icon' onClick={() => toggleView(record.id)} /> - ) - } - <div>{`${record.createTime} ${record.handleUnitName}`}</div> - <div className={`container-bottom-left-record-top-${record.handleType === '2' ? 'remark' : 'hostOrg'}`}>{record.handleType === '2' ? '配合部门' : '承办部门'}</div> - <div><img src={edit} alt='' className='container-bottom-left-record-top-edit' onClick={() => handleEdit(record.id)} /></div> - </div> - <div className='container-bottom-left-record-bottom' style={{ display: record.showView ? 'block' : 'none' }}> - <table border="1" cellpadding="8" className='container-bottom-left-record-bottom-table'> - <tr> - <th bgcolor="#F7F8FA" className="table-title" width="120">操作人</th> - <td>{record.handleUnitName}</td> - </tr> - <tr> - <th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th> - <td>{record.handleContent}</td> - </tr> - <tr> - <th bgcolor="#F7F8FA" className="table-title" width="120">办理附件</th> - <td>{record.handleUnitName}</td> - </tr> - </table> - </div> - </div> - ))} - </div> - : - <Empty - icon={ - <div - style={{ - display: 'flex', - justifyContent: 'center', - marginBottom: '100px' - }} - > - <img src={empty} alt='' style={{ width: '160px', height: '160px' }} /> - </div> - } - description='暂无数据' - /> - } - {formView && - <div className='Form'> + <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> @@ -528,11 +528,10 @@ </Col> <Space size='middle'> <Button type='primary' onClick={() => handleFinish()}>保存</Button> - <Button type='secondary'>取消添加</Button> + <Button type='secondary' onClick={() => { setFormView(!formView); }}>取消添加</Button> </Space> </div> - - } + {/* } */} </Col> </Form> <Space style={{ marginTop: '38px', bottom: '4px' }}> @@ -592,34 +591,65 @@ name='lang' defaultValue='1' style={{ display: 'flex', margin: '0 16px 0px 16px', }} + value={radioValue} + onChange={(v) => setRadioValue(v)} > <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> + { + radioValue === '1' && + <div className='Supervising'> + <div style={{ display: 'flex', marginBottom: '4px' }}> + <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> - <div className='Supervising-item'> - <div className='Supervising-item-title'>督办时间:</div> - <div>2024-7-12 10:50</div> + } + { + radioValue === '2' && + <div className='Supervising'> + <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> + <div className='Supervising-info'> + <div className='Supervising-info-time'>已于2024-7-13 12:00回复完成</div> + <div className='Supervising-info-detail' onClick={() => setDetail(true)}>查看详情</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> - <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> + } </Typography.Paragraph> </TabPane> </Tabs> @@ -668,8 +698,8 @@ </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} @@ -678,6 +708,26 @@ }}//默认值 > <Row> + <Col span={24}> + <FormItem + label={<div style={{display:'flex'}}><div>督办部门</div><div style={{ color: '#86909C' }}>(可多选)</div></div>} + field='caseDes' + > + <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' @@ -728,8 +778,8 @@ </Row> </Form> </Modal> - <Modal visible={response} onCancel={() => setResponse(false)} title='回复督办' centered footer={null} style={{overflowY:'auto'}}> - <div style={{ }}> + <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> @@ -771,28 +821,26 @@ <FormItem field='suggestion' > - <div> - + <div style={{ display: 'flex', justifyContent: 'space-between' }}> + <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 style={{ color: '#1A6FB8' }} onClick={() => SetMode(!mode)}>更多模板</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' }} @@ -802,7 +850,7 @@ </Col> <Col span={24}> <FormItem - label='附件材料' + label={<div style={{ display: 'flex', }}><div>附件材料</div><img src={question1} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} /></div>} field='caseDes' rules={[{ message: '请填写事项概况', required: true }]} > @@ -818,11 +866,98 @@ /> </FormItem> </Col> - <Button type='primary' style={{ marginTop: '-16px',marginBottom:'16px' }} onClick={() => handleSupervising()}>提交</Button> + <Button type='primary' style={{ marginTop: '-16px', marginBottom: '16px' }} onClick={() => handleSupervising()}>提交</Button> </Row> </Form> </div> </Modal> + <Modal visible={mode} onCancel={() => SetMode(false)} title='选择模板' centered footer={null}> + <TableView + columns={fakeColumns} + dataSource={fakeData1} + size="small" + rowKey="id" + bordered={true} + style={{}} + /> + + </Modal> + <Modal simple={true} visible={modeDetail} cancelText='关闭' okText='使用' onOk={() => handleUse()} onCancel={() => setModeDetail(!modeDetail)} style={{ width: '400px', borderRadius: ' 4px' }}> + <div className='modal'> + <div className='modal-mark'>模板</div> + <div className='modal-title'>尽快启动调解程序督办</div> + </div> + <div style={{ marginBottom: '-16px' }}> + 鉴于本事项的重要性及紧迫性,现要求你尽快启动调解程序,并确保案件能够得到及时有效的处理。请您务必于本周内完成以下 + 事项:<br /> + [事项1......]<br /> + [事项2......]<br /> + [事项3......]<br /> + 请确保在事项办理的过程中,遵循公平、公正的原则,并积极促进双方达成共识。 + </div> + </Modal> + <Modal visible={detail} onCancel={() => setDetail(false)} title='督办回复详情' centered footer={null}> + <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>张三丰 + <img src={register} alt='' className='icon-register' /> + </div> + </Col> + <Col span={24}> + <div className="title-text">督办内容</div> + <div>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div> + </Col> + <Col span={24}> + <div className="title-text">督办附件</div> + <div style={{ display: 'flex' }}> + <img src={link} alt="" className="title-file" /> + <div style={{ color: '#1A6FB8' }}>广东好又多贸易有限公司营业执照副本.pdf</div> + </div> + + </Col> + </Row> + <Col span={24} style={{ marginBottom: '8px', marginTop: '20px' }}> + <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>张三丰 + <img src={register} alt='' className='icon-register' /> + </div> + </Col> + <Col span={24}> + <div className="title-text">回复内容</div> + <div>该纠纷事件目前群众较为关注,现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案,并确保与当事人进行有效沟通。请各位积极响应,高效协作,争取在最短时间内妥善处理完毕。</div> + </Col> + <Col span={24}> + <div className="title-text">附件材料</div> + <div style={{ display: 'flex' }}> + <img src={link} alt="" className="title-file" /> + <div style={{ color: '#1A6FB8' }}>李晓明的人民调解协议书.pdf</div> + </div> + + </Col> + </Row> + + + </Modal> <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} /> -- Gitblit v1.8.0