From 0d40ce565cdc87668f83dbeddbf1246536986f9e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 14 Sep 2024 18:02:36 +0800
Subject: [PATCH] fix: 样式、自行排查
---
gz-customerSystem/src/views/register/matterDetail/index.jsx | 2
gz-customerSystem/src/views/register/index.less | 2
gz-customerSystem/src/components/personCard/DetailDialog.jsx | 5
gz-customerSystem/src/views/register/visit/preview.jsx | 4
gz-customerSystem/src/views/register/visit/SelfInspection.jsx | 264 ++++++++++++++++++++++++++
gz-customerSystem/src/views/register/visit/index.jsx | 45 +++-
gz-customerSystem/src/views/register/index.jsx | 2
gz-customerSystem/src/views/register/visit/SelfPreview.jsx | 235 +++++++++++++++++++++++
gz-customerSystem/src/router/router.js | 3
9 files changed, 542 insertions(+), 20 deletions(-)
diff --git a/gz-customerSystem/src/components/personCard/DetailDialog.jsx b/gz-customerSystem/src/components/personCard/DetailDialog.jsx
index 9038fef..2a94e1c 100644
--- a/gz-customerSystem/src/components/personCard/DetailDialog.jsx
+++ b/gz-customerSystem/src/components/personCard/DetailDialog.jsx
@@ -357,6 +357,11 @@
...res,
value: filterValue
}
+ } else if (res.field === 'extreme') {
+ return {
+ ...res,
+ value: data[res.field] === 0 ? '否' : '是'
+ }
} else {
return {
...res,
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index b1b9b40..12bdc47 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -144,6 +144,8 @@
import ClosingReview from '../views/register/closingReview';
//工作台
import VisitWorkBench from '../views/register';
+//自行排查
+import SelfInspection from '../views/register/visit/SelfInspection';
import Test from '../views/test';
@@ -222,6 +224,7 @@
<Route path="visit/fileMessage" element={<FileMessage />} />
<Route path="visit/closingReview" element={<ClosingReview />} />
<Route path="visit/visitWorkBench" element={<VisitWorkBench />} />
+ <Route path="selfInspection/:id?" element={<SelfInspection />} />
{/* 工作流模块 */}
<Route path="workflowTemplate" element={<WorkflowTemplate />} />
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 8f5a353..a73a734 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -1464,7 +1464,7 @@
<div className='VisitWorkBench-bottom-title' style={{ color: '#206BCD' }}>大厅来访</div>
{/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
- <div className='bottomTab2'>
+ <div className='bottomTab2' onClick={() => navigate(`/mediate/selfInspection`)}>
<div className='VisitWorkBench-bottom-title' style={{ color: '#D46B08' }}>自行排查</div>
{/* <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 35027f2..4b3a281 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -934,7 +934,7 @@
padding: 12px 16px 16px 16px;
flex: 1;
justify-content: center;
-
+ cursor: pointer;
}
.timeTip {
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 84efe13..08c5efb 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -29,7 +29,7 @@
const partyList = data.personList.concat(data.agentList)
setInfoData({
...data,
- questionName: data.queProvName === null ? '-' : data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName,
+ questionName: data.queAreaName === null ? '-' : data.queAreaName + '/' + data.queRoadName,
caseType: data.caseTypeFirstName === null ? '-' : data.caseTypeFirstName + '/' + data.caseTypeName
})
setFakeData(partyList.map(item => {
diff --git a/gz-customerSystem/src/views/register/visit/SelfInspection.jsx b/gz-customerSystem/src/views/register/visit/SelfInspection.jsx
new file mode 100644
index 0000000..372812c
--- /dev/null
+++ b/gz-customerSystem/src/views/register/visit/SelfInspection.jsx
@@ -0,0 +1,264 @@
+import React, { useState, useRef, Fragment, useEffect } from "react";
+import { useParams, useNavigate } from 'react-router-dom';
+import NewPage from '@/components/NewPage';
+import * as $$ from '@/utils/utility';
+import "@arco-themes/react-gzzz/css/arco.css";
+import '../index.less';
+import { Space } from 'antd';
+import { Button, Steps, Message } from '@arco-design/web-react';
+import VisitorRegister from './component/visitorRegister';
+import Preview from './preview';
+
+const Step = Steps.Step;
+
+function saveDispute(data) {
+ return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
+}
+
+function getId() {
+ return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
+}
+
+function submitDispute(data) {
+ return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
+}
+
+function getDetailData(id) {
+ return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
+}
+
+
+const Organization = (props) => {
+ const formRef = useRef();
+ const routeData = useParams();
+ const navigate = useNavigate();
+ const [isReview, setIsReview] = useState(false);//预览页面控制
+ const [current, setCurrent] = useState(1);
+ const [id, setId] = useState();
+ const [editData, setEditData] = useState({});//回显数据
+
+ useEffect(() => {
+ if (routeData.id) {
+ getDeatil(routeData.id)
+ setId(routeData.id)
+ } else {
+ getAppId()
+ }
+
+ }, [])
+
+ //编辑
+ const getDeatil = async (id) => {
+ const res = await getDetailData(id)
+ if (res.type) {
+ const { agentList, personList, ...rest } = res.data
+ const parList = agentList.concat(personList)
+ const newParList = parList?.map(item => {
+ const fileInfoList = item.fileInfoList
+ let file = [];//身份证明材料、企业登记材料
+ let file1 = [];//法人、机构身份证明材料、代理人授权委托书
+ if (fileInfoList && fileInfoList.length != 0) {
+ fileInfoList.forEach(item => {
+ if (item.ownerType == '22_00018-202' || item.ownerType == '22_00018-203') {
+ item.fileList.forEach(res => {
+ file.push({
+ ...res,
+ uid: res.id,
+ })
+ })
+ }
+ if (item.ownerType == '22_00018-204' || item.ownerType == '22_00018-207') {
+ item.fileList.forEach(res => {
+ file1.push({
+ ...res,
+ uid: res.id,
+ })
+ })
+ }
+ })
+ }
+ return {
+ ...item,
+ file,
+ file1
+ }
+ }) || []
+ const obj = {
+ ...rest,
+ fakeData: newParList,
+ myCaseType: [rest.caseTypeFirst, rest.caseType],
+ myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined
+ }
+ formRef.current.setFieldsValue(obj)
+ setEditData(obj)
+ }
+ }
+
+ //获取id
+ const getAppId = async () => {
+ const res = await getId()
+ if (res.type) {
+ setId(res.data)
+ }
+ }
+
+ //提交信息，需要校验规则
+ const handleSubmit = async () => {
+ if (formRef.current) {
+ formRef.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ $$.modalInfo({
+ title: '提醒',
+ content: '确定提交吗？',
+ cancelText: '我再想想',
+ onOk: () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
+ })
+ },
+ });
+ }
+ });
+ }
+ }
+
+ //保存草稿信息,不需要校验规则
+ const handleSave = () => {
+ if (formRef.current) {
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ requestSave(params)
+ }
+ }
+
+ //数据处理
+ const handleData = (data) => {
+ const { fakeData, ...newObj } = data
+ if (data.id) {
+ return {
+ ...newObj,
+ personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"),
+ agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => {
+ return {
+ ...item,
+ personId: item.personId.join(',')
+ }
+ }),
+ }
+ } else {
+ return {
+ ...newObj,
+ personList: fakeData?.filter(item => item.perType === "15_020008-1" || item.perType === "15_020008-2"),
+ agentList: fakeData?.filter(item => item.perType === "24_00006-1" || item.perType === "24_00006-2").map(item => {
+ return {
+ ...item,
+ personId: item.personId.join(',')
+ }
+ }),
+ id: id
+ }
+ }
+ }
+
+ //预览信息
+ const handleReview = () => {
+ setIsReview(!isReview)
+ }
+
+ function selfAcceptance() {
+ if (formRef.current) {
+ formRef.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ $$.modalInfo({
+ title: '自行受理确认',
+ content: '确定自行受理吗？',
+ okText: '确定受理',
+ cancelText: '我再想想',
+ onOk: async () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 1,
+ isDraft: 0,
+ operateType: 0,
+ }, true)
+ },
+ });
+ }
+ });
+ }
+ }
+
+ //保存请求
+ const requestSave = async (data) => {
+ const response = await saveDispute(data)
+ if (response.type) {
+ Message.success('保存草稿成功！')
+ }
+ }
+
+ //提交请求
+ const reauestSubmit = async (data, isSelfAccept) => {
+ const response = await submitDispute(data)
+ if (response.type) {
+ if(isSelfAccept) {
+ //自行受理
+ navigate(`mediate/visit/handleFeedback?caseTaskId=${response.data}&caseId=${id}`)
+ } else {
+ Message.success('提交成功！')
+ navigate(`/mediate/visit/visitWorkBench`, { replace: true })
+ setCurrent(2)
+ }
+ }
+ }
+
+ return (
+ <div style={{ position: 'relative' }}>
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' }
+ }
+ >
+ <Fragment>
+ <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
+ <Steps type='navigation' current={current}>
+ <Step title='来访登记' disabled />
+ <Step title='事件流转' disabled />
+ <Step title='办理反馈' disabled />
+ <Step title='结案审核' disabled />
+ <Step title='当事人评价' disabled />
+ <Step title='结案归档' disabled />
+ </Steps>
+ </div>
+ <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 82px 16px', height: 'calc(100vh - 231px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}>
+ <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} mainId={id} />
+ </div>
+ <VisitorRegister
+ formRef={formRef}
+ style={{ display: isReview ? 'none' : '' }}
+ mainId={id}
+ partyList={editData.fakeData}
+ fileInfoList={editData.fileInfoList}
+ />
+ <div className="dataSync-excel">
+ <Space size="middle" style={{ margin: '4px 14px' }}>
+ <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>{isReview ? '修改' : '预览'}</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
+ <Button type='secondary' onClick={() => { navigate(-1) }}>返回上级页面</Button>
+ </Space>
+ </div>
+ </Fragment>
+ </NewPage>
+ </div>
+ )
+}
+
+export default Organization;
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/SelfPreview.jsx b/gz-customerSystem/src/views/register/visit/SelfPreview.jsx
new file mode 100644
index 0000000..1b42818
--- /dev/null
+++ b/gz-customerSystem/src/views/register/visit/SelfPreview.jsx
@@ -0,0 +1,235 @@
+import React, { useState, useEffect } from "react";
+import { Row, Col, Space } from 'antd';
+import * as $$ from '../../../utils/utility';
+import { ApplyDialog, AgentDialog, Respondent, Company } from './component/previewTable'
+import FileTable from "../matterDetail/FileTable";
+import { link } from '@/assets/images';
+import PreviewImage from '@/components/PreviewImage';
+
+const Preview = (props) => {
+ const [data, setData] = useState({})
+
+ useEffect(() => {
+ console.log(props.data);
+ const applyData = props.data?.fakeData?.filter(item => item.perTypeName === "申请方当事人" && item.perClassName === "自然人");
+ const agentData = props.data?.fakeData?.filter(item => item.perTypeName === "申请方代理人");
+ const company = props.data?.fakeData?.filter(item => item.perTypeName === "申请方当事人" && item.perClassName === "非法人组织");
+ const respondentData = props.data?.fakeData?.filter(item => item.perTypeName === "申请方当事人" && item.perClassName === "法人");
+
+ const applyData1 = props.data?.fakeData?.filter(item => item.perTypeName === "被申请方当事人" && item.perClassName === "自然人");
+ const agentData1 = props.data?.fakeData?.filter(item => item.perTypeName === "被申请方代理人");
+ const company1 = props.data?.fakeData?.filter(item => item.perTypeName === "被申请方当事人" && item.perClassName === "非法人组织");
+ const respondentData1 = props.data?.fakeData?.filter(item => item.perTypeName === "被申请方当事人" && item.perClassName === "法人");
+
+ setData({
+ applyData,
+ agentData,
+ company,
+ respondentData,
+ applyData1,
+ agentData1,
+ company1,
+ respondentData1
+ })
+ }, [props.data])
+
+ return (
+ <div style={{ ...props.style }}>
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>当事人信息</h4>
+ </Space>
+ </Col>
+ <div style={{ marginBottom: '8px' }}>申请方</div>
+ <div className="line-container" style={{ marginBottom: '20px' }}>
+ <div className="line left-line"></div>
+ <div className="line middle-line"></div>
+ <div className="line right-line"></div>
+ </div>
+ {/* ApplyDialog 只有在 applyData 存在且不为空时才渲染 */}
+ {data.applyData && data.applyData.length > 0 ? (
+ <ApplyDialog applyDialog={data.applyData} />
+ ) : null}
+
+ {/* AgentDialog 只有在 agentData 存在且不为空时才渲染 */}
+ {data.agentData && data.agentData.length > 0 ? (
+ <AgentDialog agentDialog={data.agentData} />
+ ) : null}
+
+ {/* Respondent 只有在 respondentData 存在且不为空时才渲染 */}
+ {data.respondentData && data.respondentData.length > 0 ? (
+ <Respondent respondent={data.respondentData} />
+ ) : null}
+
+ {data.company && data.company.length > 0 ? (
+ <Company company={data.company} />
+ ) : null}
+
+ <div style={{ marginBottom: '8px' }}>被申请方</div>
+ <div className="line-container" style={{ marginBottom: '20px' }}>
+ <div className="line left-line"></div>
+ <div className="line middle-line"></div>
+ <div className="line right-line"></div>
+ </div>
+ {data.applyData1 && data.applyData1.length > 0 ? (
+ <ApplyDialog applyDialog={data.applyData1} />
+ ) : null}
+
+ {data.agentData1 && data.agentData1.length > 0 ? (
+ <AgentDialog agentDialog={data.agentData1} />
+ ) : null}
+
+ {data.respondentData1 && data.respondentData1.length > 0 ? (
+ <Respondent respondent={data.respondentData1} />
+ ) : null}
+
+ {data.company1 && data.company1.length > 0 ? (
+ <Company company={data.company1} />
+ ) : null}
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>纠纷基本情况</h4>
+ </Space>
+ </Col>
+ <Row gutter={[16, 16]}>
+ {props.isDoc &&
+ <>
+ <Col span={8}>
+ <div><div className="title-text">事项状态</div></div>
+ <div style={{ color: '#1A6FB8' }}>{props.data?.statusName || '-'}</div>
+ </Col>
+ <Col span={16}>
+ <div><div className="title-text">事项编号</div></div>
+ <div>{props.data?.caseRef || '-'}</div>
+ </Col>
+ </>
+ }
+ <Col span={8}>
+ <div className="title">
+ <div className="title-text">事项等级</div>
+ </div>
+ <div style={{ display: 'flex' }}><div style={{ backgroundColor: '#00B42A', marginRight: '4px', borderRadius: '4px' }}><div style={{ color: '#FFFFFF', padding: '0px 6px' }}>{props.data?.caseLevel || '-'}</div></div>级</div>
+ </Col>
+ <Col span={8}>
+ <div><div className="title-text">来访时间</div></div>
+ <div>{props.data?.visitTime || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">来访人数（人）</div></div>
+ <div>{props.data?.visitPeopleNum || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">纠纷类型</div></div>
+ <div>
+ {props.data?.caseTypeFirstName ?
+ `${props.data.caseTypeFirstName}/${props.data.caseTypeName}`
+ : '-'
+ }
+ </div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">纠纷发生时间</div></div>
+ <div>{props.data?.occurTime || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">纠纷发生地点</div></div>
+ <div>{props.data?.addr || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">问题属地</div></div>
+ <div>
+ {props.data?.queAreaName ? `${props.data.queAreaName}/${props.data.queRoadName}` : '-'
+ }
+ </div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">涉及人数（人）</div></div>
+ <div>{props.data?.peopleNum || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">涉及金额（元）</div></div>
+ <div>{$$.thousands(props.data?.amount) || '-'}</div>
+ </Col>
+ <Col span={8}>
+ <div ><div className="title-text">事项来源</div></div>
+ <div>{props.data?.canalName}</div>
+ </Col>
+ <Col span={16}>
+ <div ><div className="title-text">来访形式</div></div>
+ <div>来访</div>
+ </Col>
+ <Col span={24}>
+ <div className="title"><div className="title-text">事项概况</div></div>
+ <div>{props.data?.caseDes || '-'} </div>
+ </Col>
+ <Col span={24}>
+ <div className="title"><div className="title-text">事项申请</div></div>
+ <div>{props.data?.caseClaim || '-'}</div>
+ </Col>
+ <Col span={16}>
+ <div className="title"><div className="title-text">是否重大矛盾纠纷</div></div>
+ <div>{props.data?.majorStatus === 1 ? '是' : '否'}</div>
+ </Col>
+ </Row>
+ {props.transactResult && <>
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', marginTop: '20px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>办理结果</h4>
+ </Space>
+ </Col>
+ <table border="1" align="center" cellpadding="8" className="table" >
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">化解结果</th>
+ <td width='380'>{props.transactResult.mediResultName || '-'}</td>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">经办人</th>
+ <td width='380'>{props.transactResult.mediator || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title">承办部门</th>
+ <td>{props.transactResult.mediateUnitName || '-'}</td>
+ <th bgcolor="#F7F8FA" className="table-title">配合部门</th>
+ <td>{props.transactResult.applyAssistUnitName || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">受理时间</th>
+ <td width='380'>{$$.minuteFormat(props.transactResult?.acceptTime) || '-'}</td>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">办结时间</th>
+ <td width='380'>{$$.minuteFormat(props.transactResult?.closeTime) || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
+ <td width='380' colspan='3'>{props.transactResult?.windupContent || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">协议要点</th>
+ <td width='380' colspan='3'>{props.transactResult?.agreeContent || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">结案意见</th>
+ <td width='380' colspan='3'>{props.transactResult?.windupContent || '-'}</td>
+ </tr>
+ <tr>
+ <th bgcolor="#F7F8FA" className="table-title" width="120">协议文书</th>
+ <td colspan='3'>
+ {props.transactResult?.fileInfoBaseDTOList?.map((item, index) => {
+ console.log(item);
+ return <div style={{ display: 'inline-block' }}>
+ <PreviewImage name={item.name} src={item.showUrl} />
+ {index !== props.transactResult?.fileInfoBaseDTOList.length - 1 && <>，</>}
+ </div>
+ })}
+ </td>
+ </tr>
+ </table>
+ </>}
+ <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}>
+ <Space size='small'>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>事件材料</h4>
+ </Space>
+ </Col>
+ <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
+ </div>
+ )
+}
+
+export default Preview
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 0002a87..3f150f2 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -180,16 +180,28 @@
}
function selfAcceptance() {
- $$.modalInfo({
- title: '自行受理确认',
- content: '确定自行受理吗？',
- okText: '确定受理',
- cancelText: '我再想想',
- onOk: async () => {
- setCurrent(3);
- navigate(`mediate/visit/handleFeedback`, { replace: true })
- },
- });
+ if (formRef.current) {
+ formRef.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ $$.modalInfo({
+ title: '自行受理确认',
+ content: '确定自行受理吗？',
+ okText: '确定受理',
+ cancelText: '我再想想',
+ onOk: async () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 1,
+ isDraft: 0,
+ operateType: 0,
+ }, true)
+ },
+ });
+ }
+ });
+ }
}
//保存请求
@@ -201,12 +213,17 @@
}
//提交请求
- const reauestSubmit = async (data) => {
+ const reauestSubmit = async (data, isSelfAccept) => {
const response = await submitDispute(data)
if (response.type) {
- Message.success('提交成功！')
- navigate(`/mediate/visit/visitWorkBench`, { replace: true })
- setCurrent(2)
+ if(isSelfAccept) {
+ //自行受理
+ navigate(`mediate/visit/handleFeedback?caseTaskId=${response.data}&caseId=${id}`)
+ } else {
+ Message.success('提交成功！')
+ navigate(`/mediate/visit/visitWorkBench`, { replace: true })
+ setCurrent(2)
+ }
}
}
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index d908672..1e608dc 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -146,9 +146,7 @@
<Col span={8}>
<div ><div className="title-text">问题属地</div></div>
<div>
- {props.data?.queProvName ?
- `${props.data.queCityName}/${props.data.queAreaName}/${props.data.queRoadName}`
- : '-'
+ {props.data?.queAreaName ? `${props.data.queAreaName}/${props.data.queRoadName}` : '-'
}
</div>
</Col>
--
Gitblit v1.8.0