From 86df8c2c269721e5ac76b41e740fb0647eda1f27 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 10 Sep 2024 16:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 77d07c1..3db9acb 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
+import { useParams } from 'react-router-dom';
import { Col, Space, Row, Tooltip } from 'antd';
import { register, aiPerson } from '@/assets/images';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
@@ -14,6 +15,7 @@
import HandleRecord from '../../matterDetail/HandleRecord';
import SupervisingView from '../../matterDetail/Supervising'
import UniteHandle from '../../matterDetail/UniteHandle';
+import { useNavigate } from 'react-router-dom';
const Option = Select.Option;
@@ -76,12 +78,12 @@
];
-function choosePrincipalApi(id) {
- return $$.ax.request({ url: 'caseInfoUnfold/choosePrincipal?caseId=24083010062110001&userId=' + id, type: 'get', service: 'mediate' });
+function choosePrincipalApi(caseId, userId) {
+ return $$.ax.request({ url: `caseInfoUnfold/choosePrincipal?caseId=${caseId}&userId=` + userId, type: 'get', service: 'mediate' });
}
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 getNewTimeIdApi(id) {
@@ -110,8 +112,9 @@
-const Handle = () => {
+const Handle = ({ authorData, caseTaskId, caseId }) => {
const formRef = useRef();
+ const navigate = useNavigate();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
const [wantUser, setWantUser] = useState({});
@@ -128,6 +131,8 @@
const [isModalVisible, setIsModalVisible] = useState(false);
const [id, setId] = useState('');
const [uniteHandleId, setUniteHandleId] = useState('');
+ const [caseResultId, setCaseResultId] = useState('');
+ const [managerName, setManagerName] = useState('')
const tabs = [
@@ -144,9 +149,8 @@
{ value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' }
];
- const tabs2 = [
- { index: '1', label: '公共模板1：回复督办内容收到通用范本' },
- ]
+
+
const handleTabChange = (newTabIndex) => {
@@ -176,7 +180,7 @@
const choosePrincipal = async (id) => {
console.log(id, 'choosePrincipalId')
- const res = await choosePrincipalApi(id)
+ const res = await choosePrincipalApi(caseId, id)
if (res.type) {
let data = res.data
console.log(data, 'choosePrincipalchoosePrincipal')
@@ -211,24 +215,24 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback('24083010062110001')
+ listFeedback(caseId)
}
} else {
const res = await saveFeedbackApi({
...submitData,
- caseId: "24083010062110001",
+ caseId: caseId,
id: id,
caseTaskId: '',
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback('24083010062110001')
+ listFeedback(caseId)
}
}
}
const getFeedbackInfo = async () => {
- const res = await getFeedbackInfoApi('24083010062110001')
+ const res = await getFeedbackInfoApi(caseTaskId)
setFeedbackInfoData(res.data)
console.log(res.data, 'res.data')
}
@@ -237,8 +241,10 @@
const listFeedback = async (id) => {
const res = await listFeedbackApi(id)
if (res.type) {
- let data = res.data.caseFeedbackList
+ let data = res.data.caseFeedbackList;
+ let manager = res.data.manager
setList(data)
+ setManagerName(manager)
}
}
@@ -251,6 +257,9 @@
}
if (type === 'addMark')
setId(res.data)
+ if (type === 'caseResult') {
+ setCaseResultId(res.data)
+ }
}
}
@@ -303,12 +312,32 @@
}
+ const handleCaseResultApply = () => {
+ SetCaseResult(!caseResult)
+ getNewTimeId('caseResult')
+ }
+
useEffect(() => {
- listFeedback('24083010062110001');
+ listFeedback(caseId);
getFeedbackInfo();
getByIdRole();
}, [])
+
+ // useEffect(() => {
+ // if (authorData) {
+ // const { buttonList } = authorData;
+ // setStaticButtonList(myButton.filter(item => {
+ // const flag = buttonList.some(result => {
+ // if (result.id === item.key) {
+ // return true
+ // }
+ // })
+ // return flag
+ // }))
+ // }
+ // }, [authorData])
+
return (
@@ -368,7 +397,10 @@
{wantUser.wantUserId ?
<WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
- <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
+ caseId && managerName ?
+ <WantUserTag name={managerName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
+ :
+ <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
}
</FormItem>
</Col>
@@ -422,7 +454,7 @@
>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${'24083010062110001'}&ownerId=${id}&ownerType=${'22_00018-501'}`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseId}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -447,9 +479,9 @@
<Space style={{ marginTop: '38px', bottom: '4px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => SetCaseResult(!caseResult)}>结案申请</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => handleCaseResultApply()} >结案申请</Button>
<Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
- <Button type='secondary'>返回上级页面</Button>
+ <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
<div className='container-bottom-right'>
@@ -509,12 +541,14 @@
visible={isModalVisible}
checkKeys={wantUser.wantUserId ? [{ label: wantUser.wantUserName, value: wantUser.wantUserId }] : undefined}
onOk={(value) => {
+ console.log(value, 'value')
console.log(value.key, value, 'value.key', 'value')
setIsModalVisible(false);
setWantUser({ wantUserId: value.keys[0], wantUserName: value.items[0].name });
handleCheckedKeys(value.keys?.[0])
}}
onClose={() => setIsModalVisible(false)}
+ type='person'
/>
<DocumentScanner
@@ -629,7 +663,7 @@
</Form>
</Modal>
<UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
- <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />
+ <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId} />
</div>
</>
--
Gitblit v1.8.0