From f6939b0ec6680da8416a3161b524e7b73a7a3db8 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 10 Sep 2024 16:55:34 +0800
Subject: [PATCH] fix: delete改回get请求
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 44 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 039692d..3db9acb 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -1,6 +1,7 @@
import React, { useState, useRef, useEffect } from 'react';
+import { useParams } from 'react-router-dom';
import { Col, Space, Row, Tooltip } from 'antd';
-import { register,} from '@/assets/images';
+import { register, aiPerson } from '@/assets/images';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
@@ -13,6 +14,8 @@
import ArcoUpload from '@/components/ArcoUpload';
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;
@@ -75,8 +78,8 @@
];
-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) {
@@ -99,28 +102,38 @@
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 getByIdRoleApi(id) {
+ return $$.ax.request({ url: `ctUser/getByIdRole?id=` + id, type: 'get', service: 'cust' });
+}
-
-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({});
const [formView, setFormView] = useState(false);
const [personView, setPersonView] = useState(false);
const [supervising, setSupervising] = useState(false)
const [data, setData] = useState({})
+ const [feedbackInfoData, setFeedbackInfoData] = useState({})
+ const [personData, setPersonData] = useState({})
const [caseResult, SetCaseResult] = useState(false);
- const [response, setResponse] = useState('')
const [list, setList] = useState([]);
const [mode, SetMode] = useState(false);
- const [modeDetail, setModeDetail] = useState(false);
- const [radioValue, setRadioValue] = useState('')
- const [detail, setDetail] = useState(false);
+ const [uniteHandleView, setUniteHandleView] = useState(false);
+ const [isModalVisible, setIsModalVisible] = useState(false);
+ const [id, setId] = useState('');
+ const [uniteHandleId, setUniteHandleId] = useState('');
+ const [caseResultId, setCaseResultId] = useState('');
+ const [managerName, setManagerName] = useState('')
+
const tabs = [
{ index: '1', label: '承办部门' },
@@ -136,12 +149,9 @@
{ value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' }
];
- const tabs2 = [
- { index: '1', label: '公共模板1：回复督办内容收到通用范本' },
- ]
- const [isModalVisible, setIsModalVisible] = useState(false);
- const [id, setId] = useState('')
+
+
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
@@ -170,11 +180,17 @@
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')
}
+
+ }
+
+ const getByIdRole = async () => {
+ const res = await getByIdRoleApi('2105180249501982')
+ setPersonData(res.data)
}
@@ -199,43 +215,58 @@
})
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(caseTaskId)
+ setFeedbackInfoData(res.data)
+ console.log(res.data, 'res.data')
}
//获取办理记录接口
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)
}
}
//获取理由id
- const getNewTimeId = async () => {
+ const getNewTimeId = async (type) => {
const res = await getNewTimeIdApi()
if (res.type) {
- setId(res.data)
+ if (type === 'uniteHandle') {
+ setUniteHandleId(res.data)
+ }
+ if (type === 'addMark')
+ setId(res.data)
+ if (type === 'caseResult') {
+ setCaseResultId(res.data)
+ }
}
}
//添加办理记录
const addMark = () => {
setFormView(!formView);
- getNewTimeId()
+ getNewTimeId('addMark')
}
//保存信息
@@ -257,6 +288,13 @@
setSupervising(!supervising)
}
+ const uniteHandle = () => {
+ getNewTimeId('uniteHandle')
+ setUniteHandleView(!uniteHandleView)
+ }
+
+
+
const handleTabChange1 = (newTabIndex) => {
setSelectedTab1(newTabIndex);
};
@@ -269,11 +307,37 @@
setSupervising(!supervising)
}
+ const handlePersonView = () => {
+ setPersonView(!personView)
+
+ }
+
+ const handleCaseResultApply = () => {
+ SetCaseResult(!caseResult)
+ getNewTimeId('caseResult')
+ }
+
useEffect(() => {
- listFeedback('24083010062110001');
- // getByIdRole()
+ 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 (
@@ -288,22 +352,22 @@
<Row gutter={[16, 16]}>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">承办部门：</div></div>
- <div>天河区棠下街综治中心</div>
+ <div>{feedbackInfoData?.handleUnitName}</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">经办人：</div></div>
<div style={{ display: 'flex' }}>
- <div>王一顺</div>
- <img onClick={() => setPersonView(!personView)} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ <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' }}>
<div><div className="title-text">配合部门：</div></div>
- <div>-</div>
+ <div>{feedbackInfoData?.assistUnitName}</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">受理时间：</div></div>
- <div>2024-7-5 11:45</div>
+ <div>{feedbackInfoData?.acceptTime}</div>
</Col>
</Row>
@@ -333,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>
@@ -387,7 +454,7 @@
>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-102`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseId}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -411,10 +478,10 @@
</Form>
<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' }}>联合处置申请</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={() => 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'>
@@ -474,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
@@ -491,21 +560,21 @@
<table border="1" align="center" cellpadding="5" className="table">
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th>
- <td width='380'><div style={{ display: 'flex' }}><div>{data.trueName}</div></div></td>
+ <td width='380'><div style={{ display: 'flex' }}><div>{personData?.trueName}</div></div></td>
<th bgcolor="#F7F8FA" className="table-title" width="120">登录账号</th>
- <td width='380'>{data.acc}</td>
+ <td width='380'>{personData?.acc}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">手机号码</th>
- <td>{data.mobile}</td>
+ <td>{personData?.mobile}</td>
<th bgcolor="#F7F8FA" className="table-title">工作电话</th>
- <td>020-83002020</td>
+ <td>-</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">所属部门</th>
- <td>{data.deptName}</td>
+ <td>{personData?.deptName}</td>
<th bgcolor="#F7F8FA" className="table-title">职务</th>
- <td>主任</td>
+ <td>{personData?.userRoles}</td>
</tr>
</table>
</Modal>
@@ -523,7 +592,7 @@
<Col span={24}>
<FormItem
label={<div style={{ display: 'flex' }}><div>督办部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
- field='caseDes'
+ field=''
>
<Select
mode='multiple'
@@ -593,7 +662,8 @@
</Row>
</Form>
</Modal>
- <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />
+ <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
+ <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId} />
</div>
</>
--
Gitblit v1.8.0