From 0eca6aea6132685e860a49eb983598ccc858dc47 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 10 Sep 2024 15:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/index.jsx | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 26359b2..7530f0d 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-09 22:29:34
+ * @LastEditTime: 2024-09-10 12:19:44
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -16,9 +16,9 @@
const TabPane = Tabs.TabPane;
-function pageMyTaskBlApi(data) {
- return $$.ax.request({ url: `caseTask/pageMyTaskBl`, type: 'get', service: 'mediate', data });
-}
+// function pageMyTaskBlApi(data) {
+// return $$.ax.request({ url: `caseTask/pageMyTaskBl`, type: 'get', service: 'mediate', data });
+// }
function getCountListApi(data) {
return $$.ax.request({ url: `caseTask/getCountList`, type: 'get', service: 'mediate', data });
@@ -41,6 +41,11 @@
//办理中
function pageMyTaskBlzApi(data) {
return $$.ax.request({ url: `caseTask/pageMyTaskBlz?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//待审核
+function pageMyTaskShApi(type) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskSh?page=1&size=10&sortType=1&status=1&type=` + type, type: 'get', service: 'mediate' });
}
//签收
@@ -428,8 +433,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
@@ -976,7 +981,16 @@
setFakeData1(res.data?.content)
}
}
+ if (type === '5') {
+ }
+ }
+ const handleSh = async (e) => {
+ console.log(direction, 'direction')
+ const res = await pageMyTaskShApi(e === '回退审核' ? 1 : e === '上报审核' ? 2 : e === '结案申请审核' ? 3 : e === '联合处置审核' ? 4 : null)
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
}
const handleColumnType = (type) => {
@@ -995,6 +1009,12 @@
if (type === '1') {
if (tabActivekey === '1') {
setColumnType(fakeColumns3)
+ }
+ }
+
+ if (type === '3') {
+ if (tabActivekey === '4') {
+ setColumnType(backColumn)
}
}
@@ -1036,13 +1056,13 @@
}
}
- const pageMyTaskBl = async () => {
- const res = await pageMyTaskBlApi({ page: 1, size: 10, timeStart: '', timeEnd: '', partyName: '', sortType: '', sortColmn: '' })
- if (res.type) {
- console.log(res.data, 'res.data')
- // setColumn(res.data)
- }
- }
+ // const pageMyTaskBl = async () => {
+ // const res = await pageMyTaskBlApi({ page: 1, size: 10, timeStart: '', timeEnd: '', partyName: '', sortType: '', sortColmn: '' })
+ // if (res.type) {
+ // console.log(res.data, 'res.data')
+ // // setColumn(res.data)
+ // }
+ // }
const getCountList = async () => {
const res = await getCountListApi()
@@ -1111,7 +1131,7 @@
type='button'
name='direction'
value={direction}
- onChange={(e) => setDirection(e)}
+ onChange={(e) => { setDirection(e); handleSh(e) }}
style={{ marginBottom: 16 }}
options={['回退审核', '上报审核', '结案申请审核', '联合处置审核']}
></Radio.Group>
@@ -1166,6 +1186,17 @@
}
>
<Typography.Paragraph>
+ <TableView
+ columns={columnType}
+ dataSource={fakeData1}
+ size="small"
+ rowKey="id"
+ bordered={true}
+ // style={{ marginBottom: '65px', marginTop: '-16px' }}
+ rowSelection={{
+ type: 'Checkbox'
+ }}
+ />
</Typography.Paragraph>
</TabPane>
}
--
Gitblit v1.8.0