From 5aa4a814ab8d4aa194a9683ebefaefdfc6d92c3a Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Tue, 17 Sep 2024 17:18:05 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master --- gz-customerSystem/src/views/register/eventFlow/component/EscalationModel.jsx | 58 +++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EscalationModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EscalationModel.jsx index 5ec4abf..1bb57d2 100644 --- a/gz-customerSystem/src/views/register/eventFlow/component/EscalationModel.jsx +++ b/gz-customerSystem/src/views/register/eventFlow/component/EscalationModel.jsx @@ -5,6 +5,7 @@ import { Scrollbars } from "react-custom-scrollbars"; import { escalation } from '@/assets/images/icon'; import * as $$ from '@/utils/utility'; +import { useNavigate } from 'react-router-dom'; const FormItem = Form.Item; const TextArea = Input.TextArea; @@ -15,20 +16,38 @@ } function delFile(id) { - return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'delete', service: 'sys', data: { id } }); + return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } }); } function appearApply(data) { return $$.ax.request({ url: `caseTask/appearApply`, type: 'post', service: 'mediate', data }); } +function getAppearToUnit() { + return $$.ax.request({ url: `ctUnit/getAppearToUnit`, type: 'get', service: 'cust' }); +} + export default function BackModel(props) { + const navigate = useNavigate(); const formRef = useRef(); - const [id, setId] = useState() + const [id, setId] = useState(); + const [unitData, setUnitData] = useState({}); useEffect(() => { getAppId() + getAppearToUnitData() }, []) + + //获取上报部门 + const getAppearToUnitData = async () => { + const res = await getAppearToUnit() + if (res.type) { + setUnitData({ + auditUnitId: res.data.auditUnitId, + auditUnitName: res.data.auditUnitName + }) + } + } //获取id const getAppId = async () => { @@ -39,23 +58,23 @@ } const handleSubmit = () => { - formRef.current.validate(undefined, (errors, values) => { - if (formRef.current) { - formRef.current.validate(undefined, (errors, values) => { - if (!errors) { - handleEscala({ - id, - caseId: props.caseId, - returnContent: values.returnContent - }) - } - }) - } - }) + if (formRef.current) { + formRef.current.validate(undefined, (errors, values) => { + if (!errors) { + handleEscala({ + id, + caseId: props.caseId, + caseTaskId: props.caseTaskId, + appearContent: values.appearContent, + ...unitData + }) + } + }) + } } const handleTemplate = (type) => { - if(type === 1) { + if (type === 1) { formRef.current.setFieldValue('returnContent', '经初步核查,该事项较为复杂,且涉及多个相关部门的协调配合,为确保能够高效、妥善地解决当事人的问题,特此请求上级给予指导和支持。') } else { formRef.current.setFieldValue('returnContent', '') @@ -68,6 +87,7 @@ if (res.type) { $$.infoSuccess({ content: '提交申请成功!' }); props.onCancel() + navigate('/mediate/visit/visitWorkBench') } } @@ -94,10 +114,10 @@ <Col span={24}> <FormItem label='上报至' - field='trueName' + field='name' > <div className='myTag' > - <img src={escalation} alt="" className="title-file" />白云区综治中心 + <img src={escalation} alt="" className="title-file" />{unitData.auditUnitName} </div> </FormItem> </Col> @@ -108,7 +128,7 @@ </div> <FormItem label={(<div style={{ display: 'flex' }}>上报意见<div className="must">必填</div></div>)} - field='returnContent' + field='appearContent' rules={[{ required: true, message: '请选择回退理由' }]} > <TextArea -- Gitblit v1.8.0