From 8c51130620da8ef42591558e33b7069cecca2894 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 11:55:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 109 +++++++++++++++++++-----------------------------------
1 files changed, 39 insertions(+), 70 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 93ee1b7..3ba1229 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -25,57 +25,7 @@
-const fakeData = [
- {
- handlerUserName: '天河区棠下街综治中心',
- finishTime: new Date().getTime() - 24 * 60 * 60 * 1000, // 一天前的时间
- handleResult: '1',
- status: '2',
- taskNodeName: '来访登记',
- mediResult: '22_00025-1',
- handleContent: '调解成功，双方达成一致意见。',
- operationName: '李晓明'
- },
- {
- handlerUserName: '系统派单',
- finishTime: new Date().getTime() - 12 * 60 * 60 * 1000, // 半天前的时间
- handleResult: '1',
- status: '2',
- taskNodeName: '事件流转',
- mediResult: '22_00025-1',
- handleContent: '派单至：白云区新市街市场监管所',
- },
- {
- handlerUserName: '白云区新市街市场监管所',
- finishTime: new Date().getTime() - 11 * 60 * 60 * 1000, // 半天前的时间
- handleResult: '1',
- status: '2',
- taskNodeName: '事件流转',
- mediResult: '22_00025-1',
- handleContent: '已签收',
- operationName: '赵菲菲'
- },
- {
- handlerUserName: '白云区新市街市场监管所',
- finishTime: new Date().getTime() - 11 * 60 * 60 * 1000, // 半天前的时间
- handleResult: '1',
- status: '3',
- taskNodeName: '事件回退',
- mediResult: '22_00025-1',
- // handleContent: '已签收',
- operationName: '赵菲菲'
- },
- {
- handlerUserName: '天河区棠下街综治中心',
- finishTime: new Date().getTime() - 6 * 60 * 60 * 1000, // 6小时前的时间
- handleResult: '2',
- status: '1',
- taskNodeName: '事件流转',
- mediResult: '22_00025-1',
- handleContent: '案件已被签收，准备开始调解。',
- operationName: '李晓明'
- },
-];
+
function choosePrincipalApi(caseId, userId) {
@@ -102,14 +52,17 @@
return $$.ax.request({ url: `caseFeedback/updateFeedback`, type: 'post', service: 'mediate', data });
}
-function getFeedbackInfoApi(caseTaskId) {
- return $$.ax.request({ url: `caseFeedback/getFeedbackInfo?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
+function getFeedbackInfoApi(caseId) {
+ return $$.ax.request({ url: `caseFeedback/getFeedbackInfo?caseId=` + caseId, type: 'get', service: 'mediate' });
}
function getByIdRoleApi(id) {
return $$.ax.request({ url: `ctUser/getByIdRole?id=` + id, type: 'get', service: 'cust' });
}
+function getListCaseFlow(caseId) {
+ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=` + caseId, type: 'get', service: 'mediate' });
+}
const Handle = ({ authorData, caseTaskId, caseId }) => {
@@ -133,12 +86,10 @@
const [uniteHandleId, setUniteHandleId] = useState('');
const [caseResultId, setCaseResultId] = useState('');
const [managerName, setManagerName] = useState('')
+ const [progressData, setProgressData] = useState({});
- const tabs = [
- { index: '1', label: '承办部门' },
- { index: '2', label: '配合部门' },
- ];
+
const tabs1 = [
{ index: '1', label: '公共模板：提醒尽快启动调解程序督办模板' },
@@ -153,9 +104,7 @@
- const handleTabChange = (newTabIndex) => {
- setSelectedTab(newTabIndex);
- };
+
const handleCheckedKeys = (userId) => {
choosePrincipal(userId)
@@ -189,7 +138,7 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi(caseId)
+ const res = await getByIdRoleApi(feedbackInfoData?.handleUserId)
setPersonData(res.data)
}
@@ -234,9 +183,12 @@
}
const getFeedbackInfo = async () => {
- const res = await getFeedbackInfoApi(caseTaskId)
- setFeedbackInfoData(res.data)
- console.log(res.data, 'res.data')
+ const res = await getFeedbackInfoApi(caseId)
+ if (res.type) {
+ setFeedbackInfoData(res.data)
+ console.log(res.data, 'res.data')
+ getByIdRole();
+ }
}
//获取办理记录接口
@@ -262,6 +214,13 @@
if (type === 'caseResult') {
setCaseResultId(res.data)
}
+ }
+ }
+
+ const getData = async (id) => {
+ const res = await getListCaseFlow(id)
+ if (res.type) {
+ setProgressData(res.data)
}
}
@@ -322,8 +281,8 @@
useEffect(() => {
listFeedback(caseId);
+ getData(caseId)
getFeedbackInfo();
- getByIdRole();
}, [])
// useEffect(() => {
@@ -348,7 +307,7 @@
<div className='container-top'>
<Col span={24}>
<Space size='small'>
- <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>当事人信息</h5>
+ <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理信息</h5>
</Space>
</Col>
<Row gutter={[16, 16]}>
@@ -359,8 +318,13 @@
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">经办人：</div></div>
<div style={{ display: 'flex' }}>
- <div>{feedbackInfoData?.handleUserName}</div>
- <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ {
+ feedbackInfoData?.handleUserName ?
+ <>
+ <div>{feedbackInfoData?.handleUserName}</div>
+ <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ </> : '-'
+ }
</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
@@ -497,7 +461,11 @@
}
>
<Typography.Paragraph>
- <div style={{ display: 'flex', marginLeft: '16px', gap: '16px' }}>
+ <div className='progress'>
+ <ProgressStep progressData={progressData} hasTab={true} />
+ </div>
+
+ {/* <div style={{ display: 'flex', marginLeft: '16px', gap: '16px' }}>
{tabs.map((tab) => (
<div
key={tab.index}
@@ -518,7 +486,7 @@
<div className='progress'>
<ProgressStep progressData={fakeData} />
</div>
- }
+ } */}
</Typography.Paragraph>
</TabPane>
<TabPane
@@ -548,6 +516,7 @@
setIsModalVisible(false);
setWantUser({ wantUserId: value.keys[0], wantUserName: value.items[0].name });
handleCheckedKeys(value.keys?.[0])
+
}}
onClose={() => setIsModalVisible(false)}
type='person'
--
Gitblit v1.8.0