From 8e9f556423b0e3a19ce70df2bca8c351035368b0 Mon Sep 17 00:00:00 2001 From: zhangyongtian <1181606322@qq.com> Date: Thu, 12 Sep 2024 16:06:02 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh --- gz-customerSystem/src/views/register/index.jsx | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx index 8dbea18..568d4a1 100644 --- a/gz-customerSystem/src/views/register/index.jsx +++ b/gz-customerSystem/src/views/register/index.jsx @@ -2,7 +2,7 @@ * @Author: dminyi 1301963064@qq.com * @Date: 2024-09-08 15:14:12 * @LastEditors: dminyi 1301963064@qq.com - * @LastEditTime: 2024-09-10 23:36:06 + * @LastEditTime: 2024-09-12 15:42:34 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx * @Description: 工作台 */ @@ -57,7 +57,6 @@ function pageMyTaskDbApi(data) { return $$.ax.request({ url: `caseTask/pageMyTaskDb`, type: 'get', service: 'mediate', data }); } - //签收 function signApi(data) { @@ -1094,6 +1093,7 @@ sortColmn: 1, }) const [total, setTotal] = useState(0);//表格数据总数量 + const [loading, setLoading] = useState(false);//表格loading useEffect(() => { getCountData(); @@ -1103,20 +1103,19 @@ getTableData(tabActivekey) }, [searchData, pageData]) - const sign = async (caseId, ownerId) => { + //签收 + const handleSign = async (caseId, ownerId) => { const res = await signApi({ caseId: caseId, caseTaskId: ownerId }) if (res.type) { $$.infoSuccess({ content: '签收成功' }); getCountData(); + getTableData(tabActivekey) } - } - - const handleSign = (caseId, ownerId) => { - sign(caseId, ownerId) } //获取表格数据汇总 const getTableData = async (type) => { + setLoading(true) let res switch (type) { case '1'://待分派 @@ -1167,6 +1166,7 @@ break; } if (res.type) { + setLoading(false) const { data } = res setTableData(data?.content) setTotal(data.totalElements) @@ -1320,10 +1320,12 @@ size="small" rowKey="caseId" bordered={true} + isScroll={true}//兼容以前的,当需要表格竖向滚动,请设置这个 scroll={{ x: 1300 }} offsetHeight={153} + loading={loading} pagination={{ current: pageData.page, pageSize: pageData.size, @@ -1344,12 +1346,12 @@ </div> <div className='VisitWorkBench-bottom'> 群众来访接待 - <div style={{ display: 'flex', justifyContent: 'space-evenly', gap: '24px', marginTop: '16px' }}> - <div className='bottomTab1' style={{ cursor: 'pointer' }}> - <div className='VisitWorkBench-bottom-title' onClick={() => { navigate(`/mediate/visit`) }} style={{ color: '#206BCD' }}>大厅来访</div> + <div style={{ display: 'flex', justifyContent: 'space-evenly',gap:'24px',marginTop:'16px' }}> + <div className='bottomTab1' onClick={() => navigate(`/mediate/visit`)}> + <div className='VisitWorkBench-bottom-title' style={{ color: '#206BCD' }}>大厅来访</div> {/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */} </div> - <div className='bottomTab2' style={{ cursor: 'pointer' }}> + <div className='bottomTab2'> <div className='VisitWorkBench-bottom-title' style={{ color: '#D46B08' }}>自行排查</div> {/* <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' /> */} </div> -- Gitblit v1.8.0