From d3658688d0ae3b735ef8b257f8986c3ed6560202 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 16:13:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/matterDetail/FileTable.jsx | 1 +
gz-customerSystem/src/components/TableView/index.jsx | 17 +++++++++++------
gz-customerSystem/src/views/register/index.jsx | 14 ++++++++------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/gz-customerSystem/src/components/TableView/index.jsx b/gz-customerSystem/src/components/TableView/index.jsx
index 085038b..b2cffcb 100644
--- a/gz-customerSystem/src/components/TableView/index.jsx
+++ b/gz-customerSystem/src/components/TableView/index.jsx
@@ -33,6 +33,7 @@
rowClassName,
offsetHeight = 0,//高度偏移量
tableHeight,//自定义表格高度
+ isScroll = false,//表格是否竖向滚动，兼容以前的，当需要表格竖向滚动，请设置这个
...other
}) => {
// 80 ['类型','登记人','调解员','承办法官','调解员','签收人','退回人','处理时限','调解进度/司法确认进度','其他调解员','申请渠道','司法确认结果','助理/书记员','调解类型']
@@ -147,7 +148,7 @@
});
const scrollRef = useRef(null)
- const [height, setHeight] = useState(500);//表格高度
+ const [height, setHeight] = useState();//表格高度
useEffect(() => {
onWindowResize()
@@ -160,11 +161,15 @@
}, [])
const onWindowResize = () => {
- let offsetTop = 0;
- if (scrollRef && scrollRef.current) {
- offsetTop = getOffset(scrollRef.current).top;
+ if (tableHeight) {
+ setHeight(tableHeight)
+ } else {
+ let offsetTop = 0;
+ if (scrollRef && scrollRef.current) {
+ offsetTop = getOffset(scrollRef.current).top;
+ }
+ setHeight(getSize().windowH - offsetTop - 46 - offsetHeight)
}
- setHeight(getSize().windowH - offsetTop - 46 - offsetHeight)
};
return (
@@ -207,7 +212,7 @@
bordered={bordered}
rowSelection={rowSelection}
scroll={{
- y: height - 80,
+ y: isScroll ? height - 80 : null,
...scroll
}}
expandable={expandable}
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 3011049..568d4a1 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -58,7 +58,6 @@
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 });
@@ -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,
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
index aea5435..d1c6c39 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
@@ -351,6 +351,7 @@
rowKey="ownerType"
bordered={true}
scroll={{ x: 1300 }}
+ tableHeight={126}
/>
<Modal
style={{ width: '512px' }}
--
Gitblit v1.8.0