From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001 From: liuwh <964324856@qq.com> Date: Fri, 13 Sep 2024 19:10:30 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master --- gz-customerSystem/src/views/register/index.jsx | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx index 8270203..c1c0450 100644 --- a/gz-customerSystem/src/views/register/index.jsx +++ b/gz-customerSystem/src/views/register/index.jsx @@ -1,8 +1,8 @@ /* * @Author: dminyi 1301963064@qq.com * @Date: 2024-09-08 15:14:12 - * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-09-12 15:42:34 + * @LastEditors: lwh + * @LastEditTime: 2024-09-13 10:35:03 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx * @Description: 工作台 */ @@ -11,7 +11,7 @@ import { tab1, tab2, tab3, tab4, tab5, tab6 } from '@/assets/images' import TableView from '../../components/TableView'; import { Space } from 'antd'; -import { Tabs, Typography, Radio, Form, Input, DatePicker, Button, Grid } from '@arco-design/web-react'; +import { Tabs, Typography, Radio, Form, Input, DatePicker, Button, Grid, Modal } from '@arco-design/web-react'; import * as $$ from '@/utils/utility'; import './index.less'; @@ -61,7 +61,7 @@ return $$.ax.request({ url: `caseTask/pageMyTaskDb`, type: 'get', service: 'mediate', data }); } -//签收 +//签收接口 function signApi(data) { return $$.ax.request({ url: `caseTask/sign`, type: 'post', service: 'mediate', data }); } @@ -571,7 +571,7 @@ }, tabList: [ { - value: '0', + value: '2', label: '办理中', columns: [ { @@ -650,7 +650,7 @@ ] }, { - value: '1', + value: '0', label: '结案申请', columns: [ { @@ -722,7 +722,7 @@ ] }, { - value: '2', + value: '1', label: '已结案', columns: [ { @@ -848,7 +848,7 @@ render: (text, record) => ( <Space style={{ color: '#1A6FB8' }}> <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div> - <div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>审核</div> + <div onClick={() => navigate(`/mediate/visit/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>审核</div> </Space> ), }]), @@ -1098,7 +1098,8 @@ }) const [total, setTotal] = useState(0);//表格数据总数量 const [loading, setLoading] = useState(false);//表格loading - const [selectedRowKeys, setSelectedRowKeys] = useState([]); + const [selectedRowKeys, setSelectedRowKeys] = useState([]);//批量签收的id + const [selectedRows, setSelectedRows] = useState([]);//批量签收的数据 useEffect(() => { getCountData(); @@ -1111,15 +1112,17 @@ //批量选择 const onSelectChange = (newSelectedRowKeys, selectedRows) => { setSelectedRowKeys(newSelectedRowKeys); + setSelectedRows(selectedRows) } //签收 const handleSign = async (caseId, ownerId) => { - const res = await signApi({ caseId: caseId, caseTaskId: ownerId }) + const res = await signApi([{ caseId: caseId, caseTaskId: ownerId }]) if (res.type) { $$.infoSuccess({ content: '签收成功' }); getCountData(); getTableData(tabActivekey) + navigate(`/mediate/visit/eventFlow?caseTaskId=${ownerId}&caseId=${caseId}`) } } @@ -1148,7 +1151,7 @@ break; case '4'://办理中 const { status, ...most } = searchData - if (status && status === '0') { + if (status && status === '2') { res = await pageMyTaskBlzApi({ ...pageData, ...most @@ -1205,7 +1208,7 @@ setSearchData({ sortType: 1, sortColmn: 1, - status: '0', + status: '2', }) } else { setSearchData({ @@ -1222,7 +1225,7 @@ const getCountData = async () => { const res = await getCountListApi() if (res.type) { - const data = res.data + const data = res.data || {}; setCountData(data) } } @@ -1269,7 +1272,25 @@ //批量签收 const handleBatchQs = () => { - console.log(selectedRowKeys); + console.log(selectedRows); + const paramsList = selectedRows.map(item => { + return { + caseId: item.caseId, + caseTaskId: item.ownerId + } + }) + Modal.confirm({ + title: '签收确认', + content: '确认批量签收?', + onOk: async () => { + const res = await signApi(paramsList) + if (res.type) { + $$.infoSuccess({ content: '批量签收成功成功!' }); + getCountData(); + getTableData(tabActivekey) + } + }, + }); } const rowSelection = { @@ -1383,7 +1404,10 @@ { (tabActivekey == '2' && item.value === '1') && <div className='VisitWorkBench-middle-select'> <span>已选{selectedRowKeys.length}项</span> - <span className='linkBtnColor' onClick={() => { setSelectedRowKeys([]) }}>取消</span> + <span className='linkBtnColor' onClick={() => { + setSelectedRowKeys([]) + setSelectedRows([]) + }}>取消</span> <span className='linkBtnColor' onClick={handleBatchQs}>批量签收</span> </div> } -- Gitblit v1.8.0