From c685600f0df11156ff5dc24020d6b7d02ab3e071 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 11 Sep 2024 12:29:44 +0800
Subject: [PATCH] 修改
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 144 +++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 85 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index c27d1d1..056f38a 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -15,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;
@@ -24,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) {
@@ -82,7 +33,7 @@
}
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) {
@@ -101,19 +52,22 @@
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 }) => {
const formRef = useRef();
- const routeData = useParams();
+ const navigate = useNavigate();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
const [wantUser, setWantUser] = useState({});
@@ -131,13 +85,11 @@
const [id, setId] = useState('');
const [uniteHandleId, setUniteHandleId] = useState('');
const [caseResultId, setCaseResultId] = useState('');
- const [managerName,setManagerName] = useState('')
+ const [managerName, setManagerName] = useState('')
+ const [progressData, setProgressData] = useState({});
- const tabs = [
- { index: '1', label: '承办部门' },
- { index: '2', label: '配合部门' },
- ];
+
const tabs1 = [
{ index: '1', label: '公共模板：提醒尽快启动调解程序督办模板' },
@@ -152,9 +104,7 @@
- const handleTabChange = (newTabIndex) => {
- setSelectedTab(newTabIndex);
- };
+
const handleCheckedKeys = (userId) => {
choosePrincipal(userId)
@@ -188,9 +138,12 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi('2105180249501982')
- setPersonData(res.data)
-
+ console.log(feedbackInfoData?.handleUserId, 'feedbackInfoData?.handleUserId')
+ const res = await getByIdRoleApi(feedbackInfoData?.handleUserId)
+ if(res.type){
+ setPersonView(!personView)
+ setPersonData(res.data)
+ }
}
@@ -214,7 +167,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
} else {
const res = await saveFeedbackApi({
@@ -225,15 +179,19 @@
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
}
}
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();
+ }
}
//获取办理记录接口
@@ -259,6 +217,13 @@
if (type === 'caseResult') {
setCaseResultId(res.data)
}
+ }
+ }
+
+ const getData = async (id) => {
+ const res = await getListCaseFlow(id)
+ if (res.type) {
+ setProgressData(res.data)
}
}
@@ -307,7 +272,7 @@
}
const handlePersonView = () => {
- setPersonView(!personView)
+ getByIdRole();
}
@@ -319,8 +284,8 @@
useEffect(() => {
listFeedback(caseId);
+ getData(caseId)
getFeedbackInfo();
- getByIdRole();
}, [])
// useEffect(() => {
@@ -345,7 +310,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]}>
@@ -356,8 +321,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' }}>
@@ -396,10 +366,10 @@
{wantUser.wantUserId ?
<WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
- caseId ?
+ 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>
+ <Button onClick={() => { setIsModalVisible(true); }} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
}
</FormItem>
</Col>
@@ -440,7 +410,6 @@
wrapperStyle={{ width: '100%' }}
/>
</FormItem>
-
</Col>
<Col span={24}>
<FormItem
@@ -453,7 +422,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=${id}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -480,7 +449,7 @@
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</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'>
@@ -494,7 +463,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}
@@ -515,7 +488,7 @@
<div className='progress'>
<ProgressStep progressData={fakeData} />
</div>
- }
+ } */}
</Typography.Paragraph>
</TabPane>
<TabPane
@@ -545,6 +518,7 @@
setIsModalVisible(false);
setWantUser({ wantUserId: value.keys[0], wantUserName: value.items[0].name });
handleCheckedKeys(value.keys?.[0])
+
}}
onClose={() => setIsModalVisible(false)}
type='person'
@@ -571,7 +545,7 @@
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">所属部门</th>
- <td>{personData?.deptName}</td>
+ <td>{personData?.unitName}</td>
<th bgcolor="#F7F8FA" className="table-title">职务</th>
<td>{personData?.userRoles}</td>
</tr>
@@ -662,7 +636,7 @@
</Form>
</Modal>
<UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
- <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId}/>
+ <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId} />
</div>
</>
--
Gitblit v1.8.0