From 221546808c11df777199def992e4abbf1fc31b5a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Sat, 14 Sep 2024 10:03:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/visit/index.jsx | 184 ++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 62 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 72ba5bd..0002a87 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,15 +2,15 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-31 16:52:26
+ * @LastEditTime: 2024-09-12 14:39:18
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
-import React, { useState, useRef, Fragment } from "react";
+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 { Matter, transfer } from '@/assets/images';
import "@arco-themes/react-gzzz/css/arco.css";
import '../index.less';
import { Space } from 'antd';
@@ -32,47 +32,105 @@
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 = () => {
+
+const Organization = (props) => {
const formRef = useRef();
-
+ const routeData = useParams();
+ const navigate = useNavigate();
const [isReview, setIsReview] = useState(false);//预览页面控制
const [current, setCurrent] = useState(1);
- const [tabsActive, setTabsActive] = useState('1');
- const [tabsList, setTabList] = useState([
- {
- img: Matter,
- label: '事项详情',
- key: '1'
- },
- {
- img: transfer,
- label: '流转办理',
- key: '2',
- isNeedStep: true,//加上这个就有进度条
- },
- ])
- const breadcrumbDataMap = {
- 1: { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' },
- 2: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' },
- 3: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
+ 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)
+ }
}
- // const [current, setCurrent] = useState(1);
+
+ //获取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 data = formRef.current.getFields()
- handleData(data).then(res => {
- reauestSubmit({
- ...res,
- isSelfAccept: 0,
- isDraft: 0,
- operateType: 0,
- })
- })
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ $$.modalInfo({
+ title: '提醒',
+ content: '确定提交吗？',
+ cancelText: '我再想想',
+ onOk: () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
+ })
+ },
+ });
}
});
}
@@ -81,45 +139,37 @@
//保存草稿信息,不需要校验规则
const handleSave = () => {
if (formRef.current) {
- const data = formRef.current.getFields()
- handleData(data).then(res => {
- requestSave(res)
- })
+ const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ const params = handleData(rest)
+ requestSave(params)
}
}
//数据处理
- const handleData = async (data) => {
+ 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 => {
- //personNameList用于查看详情显示代理人名字，不需要上传，去除
- const { personNameList, ...rest } = item
return {
- ...rest,
+ ...item,
personId: item.personId.join(',')
}
}),
}
} else {
- const res = await getId()
- if (res.type) {
- 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 => {
- //personNameList用于查看详情显示代理人名字，不需要上传，去除
- const { personNameList, ...rest } = item
- return {
- ...rest,
- personId: item.personId.join(',')
- }
- }),
- id: res.data
- }
+ 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
}
}
}
@@ -136,7 +186,8 @@
okText: '确定受理',
cancelText: '我再想想',
onOk: async () => {
- setCurrent(3)
+ setCurrent(3);
+ navigate(`mediate/visit/handleFeedback`, { replace: true })
},
});
}
@@ -154,6 +205,7 @@
const response = await submitDispute(data)
if (response.type) {
Message.success('提交成功！')
+ navigate(`/mediate/visit/visitWorkBench`, { replace: true })
setCurrent(2)
}
}
@@ -176,15 +228,23 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- <Preview style={{ display: isReview ? '' : 'none' }} />
- <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} />
+ <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="large" style={{ margin: '4px 14px' }}>
+ <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}>预览</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={handleReview}>返回上级页面</Button>
+ <Button type='secondary' onClick={() => { navigate(-1) }}>返回上级页面</Button>
</Space>
</div>
</Fragment>
--
Gitblit v1.8.0