From ae3833a1fc16bd3c9fd13f8301397e5835a9e49c Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 15 Sep 2024 15:31:02 +0800
Subject: [PATCH] fix: 自行排查更改、流程组件完善
---
gz-customerSystem/src/views/register/visit/index.jsx | 117 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 35 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 3c75e2b..6783643 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -1,8 +1,8 @@
/*
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
- * @LastEditors: lwh
- * @LastEditTime: 2024-09-10 16:59:07
+ * @LastEditors: dminyi 1301963064@qq.com
+ * @LastEditTime: 2024-09-12 14:39:18
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -21,19 +21,19 @@
const Step = Steps.Step;
function saveDispute(data) {
- return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
+ return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
}
function getId() {
- return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
+ return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
}
function submitDispute(data) {
- return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', 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' });
+ return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
}
@@ -62,9 +62,39 @@
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: parList,
+ fakeData: newParList,
myCaseType: [rest.caseTypeFirst, rest.caseType],
myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined
}
@@ -89,18 +119,18 @@
const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
const params = handleData(rest)
$$.modalInfo({
- title: '提醒',
- content: '确定提交吗？',
- cancelText: '我再想想',
- onOk: () => {
- reauestSubmit({
- ...params,
- isSelfAccept: 0,
- isDraft: 0,
- operateType: 0,
- })
- },
- });
+ title: '提醒',
+ content: '确定提交吗？',
+ cancelText: '我再想想',
+ onOk: () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
+ })
+ },
+ });
}
});
}
@@ -150,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)
+ },
+ });
+ }
+ });
+ }
}
//保存请求
@@ -171,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)
+ }
}
}
@@ -198,7 +245,7 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', 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
@@ -209,7 +256,7 @@
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}>{isReview ? '修改' : '预览'}</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
--
Gitblit v1.8.0