From 285c372ff89f2a2ca57e5c957540967526e15c04 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 10 Sep 2024 16:55:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx | 4 +
gz-customerSystem/src/views/register/closingReview/index.jsx | 15 ++--
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 14 ++--
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 12 +--
gz-customerSystem/src/views/register/index.jsx | 123 ++++++++++++++++++++++++++++++++++------
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 4
6 files changed, 127 insertions(+), 45 deletions(-)
diff --git a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
index 28d201c..8a2b746 100644
--- a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
@@ -6,6 +6,7 @@
import { Scrollbars } from "react-custom-scrollbars";
import ReviewProgress from './ReviewProgress';
import * as $$ from '@/utils/utility';
+import { useNavigate } from 'react-router-dom';
const RadioGroup = Radio.Group;
const FormItem = Form.Item;
@@ -33,6 +34,7 @@
}
export default function ReviewExamine(props) {
+ const navigate = useNavigate();
const formRef = useRef();
const [result, setResult] = useState()
const [infoData, setInfoData] = useState({});
@@ -109,7 +111,7 @@
const res = await submit(data)
if (res.type) {
$$.infoSuccess({ content: '提交成功！' });
- }
+ navigate(`/mediate/visit/visitWorkBench`) }
}
//删除文件
diff --git a/gz-customerSystem/src/views/register/closingReview/index.jsx b/gz-customerSystem/src/views/register/closingReview/index.jsx
index 684c094..a9dfa4f 100644
--- a/gz-customerSystem/src/views/register/closingReview/index.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/index.jsx
@@ -12,8 +12,8 @@
const TabPane = Tabs.TabPane;
-function getTabButton(data) {
- return $$.ax.request({ url: `caseTask/getTabButton`, type: 'get', service: 'mediate', data });
+function getTabButton(caseTaskId) {
+ return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=${caseTaskId}`, type: 'get', service: 'mediate' });
}
const myTab = [
@@ -34,6 +34,8 @@
},
]
const ClosingReview = () => {
+ const caseId = $$.getQueryString('caseId')
+ const caseTaskId = $$.getQueryString('caseTaskId')
const routeData = useParams();
const [authorData, setAuthorData] = useState({});
const [tabsList, setTabsList] = useState([]);
@@ -41,13 +43,12 @@
useEffect(() => {
getAuthor()
+ console.log(caseId,caseTaskId,'caseId','caseTaskId')
}, [])
//获取权限tab和按钮权限
const getAuthor = async () => {
- const res = await getTabButton({
- caseTaskId: routeData.caseTaskId
- })
+ const res = await getTabButton(caseTaskId)
if (res.type) {
const { tabList } = res.data
setAuthorData(res.data)
@@ -70,13 +71,13 @@
//根据id定义组件
const getTypeDom = (key) => {
if (key === 'dslxq' || key === 'sxxq') {
- return <EventFlow authorData={authorData} caseId={routeData.caseId} />
+ return <EventFlow authorData={authorData} caseId={caseId} />
}
if (key === 'sqjl') {
return <ApplyInfo />
}
if (key === 'jash') {
- return <ReviewExamine caseTaskId={routeData.caseTaskId} caseId={routeData.caseId} />
+ return <ReviewExamine caseTaskId={caseTaskId} caseId={caseId} />
}
}
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index 5e4f293..f52769e 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-02 14:49:13
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 11:46:45
+ * @LastEditTime: 2024-09-10 15:46:08
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
@@ -121,7 +121,7 @@
},'windupApplyData'
)
const res = await windupApplyApi({
- mediResultName: selectedTab === '1' ? '成功' : '不成功',
+ mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
agreeType: value === 1 ? '口头协议' : '书面协议',
caseTaskId: caseTaskId,
caseId: caseId,
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 431fa9e..99f4559 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/index.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
@@ -3,7 +3,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 09:16:47
+ * @LastEditTime: 2024-09-10 16:22:30
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*
@@ -40,8 +40,8 @@
-function getTabButton(data) {
- return $$.ax.request({ url: `caseTask/getTabButton`, type: 'get', service: 'mediate', data });
+function getTabButton(caseTaskId) {
+ return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
}
@@ -108,9 +108,7 @@
const getAuthor = async () => {
- const res = await getTabButton({
- caseTaskId: caseTaskId
- })
+ const res = await getTabButton(caseTaskId)
if (res.type) {
const { tabList } = res.data
console.log(tabList, 'tabList1')
@@ -180,11 +178,11 @@
</div>
}
{tabsActive === 'sxxq' &&
- <MatterDetail hasApplet={true} hasEditBtn={true} authorData={authorData} caseId={caseId}/>
+ <MatterDetail hasApplet={true} hasEditBtn={true} authorData={authorData} caseId={caseId} />
}
{
tabsActive === 'sxbl' && <Typography.Paragraph style={style}>
- <Handle authorData={authorData} caseId={caseId} caseTaskId={caseTaskId}/>
+ <Handle authorData={authorData} caseId={caseId} caseTaskId={caseTaskId} />
</Typography.Paragraph>
}
{
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 7530f0d..c6bd0be 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 12:19:44
+ * @LastEditTime: 2024-09-10 16:54:28
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -13,6 +13,7 @@
import { Space } from 'antd';
import { Tabs, Typography, Radio } from '@arco-design/web-react';
import * as $$ from '@/utils/utility';
+
const TabPane = Tabs.TabPane;
@@ -45,7 +46,13 @@
//待审核
function pageMyTaskShApi(type) {
- return $$.ax.request({ url: `caseTask/pageMyTaskSh?page=1&size=10&sortType=1&status=1&type=` + type, type: 'get', service: 'mediate' });
+ return $$.ax.request({ url: `caseTask/pageMyTaskSh?page=1&size=10&sortType=1&status=0&type=` + type, type: 'get', service: 'mediate' });
+}
+
+
+//待审核
+function pageMyTaskBlApi(type) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskBl?page=1&size=10&sortType=1&sortColmn=1&status=` + type, type: 'get', service: 'mediate' });
}
//签收
@@ -86,7 +93,7 @@
key: '4',
label: '办理中',
bgColor: '#E6FFFB',
- num: `${CountList?.waitReview || '0'}`,
+ num: `${CountList?.processing || '0'}`,
img: tab4
},
@@ -94,7 +101,7 @@
key: '5',
label: '待审核',
bgColor: '#E8F7FF',
- num: `${CountList?.supervise || '0'}`,
+ num: `${CountList?.waitReview || '0'}`,
img: tab5
},
@@ -102,7 +109,7 @@
key: '6',
label: '督办',
bgColor: '#FFF7E6',
- num: `${CountList?.processing || '0'}`,
+ num: `${CountList?.supervise || '0'}`,
img: tab6
},
@@ -490,8 +497,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- </Space>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ </Space>
),
},
];
@@ -546,7 +553,7 @@
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/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div onClick={() => handleSign(record.caseId, record.ownerId)}>签收</div>
</Space>
),
@@ -603,7 +610,7 @@
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/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div>签收</div>
</Space>
),
@@ -659,7 +666,7 @@
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/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>
),
@@ -715,7 +722,7 @@
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/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
@@ -790,7 +797,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>详情</div>
+ <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', color: '#1A6FB8' }}>处理</div>
</Space>
),
@@ -853,7 +860,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?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/handleFeedback?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div> */}
{(direction === '回退审核' || direction === '上报审核') &&
<div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
@@ -937,6 +944,76 @@
},
])
+ //结案申请
+ const caseResultApply = [
+ {
+ title: '结案申请时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 180,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 180,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 180,
+ },
+ {
+ title: '承办部门',
+ dataIndex: 'organizingUnit',
+ key: 'organizingUnit',
+ width: 180,
+ },
+ {
+ title: '配合部门',
+ dataIndex: 'cooperatingUnit',
+ key: 'cooperatingUnit',
+ width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '化解结果',
+ dataIndex: 'mediResult',
+ key: 'mediResult',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ 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/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
+ </Space>
+ ),
+ },
+ ];
+
const sign = async (caseId, ownerId) => {
const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
if (res.type) {
@@ -989,6 +1066,7 @@
console.log(direction, 'direction')
const res = await pageMyTaskShApi(e === '回退审核' ? 1 : e === '上报审核' ? 2 : e === '结案申请审核' ? 3 : e === '联合处置审核' ? 4 : null)
if (res.type) {
+ setColumnType(caseResultApply)
setFakeData1(res.data?.content)
}
}
@@ -1005,6 +1083,10 @@
if (tabActivekey === '3') {
setColumnType(fakeColumns2Info)
}
+ if (tabActivekey === '4') {
+ setColumnType(caseResultApply)
+ pageMyTaskBl('1')
+ }
}
if (type === '1') {
if (tabActivekey === '1') {
@@ -1015,6 +1097,8 @@
if (type === '3') {
if (tabActivekey === '4') {
setColumnType(backColumn)
+ pageMyTaskBl('2')
+
}
}
@@ -1056,13 +1140,12 @@
}
}
- // 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 (type) => {
+ const res = await pageMyTaskBlApi(type)
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
const getCountList = async () => {
const res = await getCountListApi()
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index ccf5546..97153d1 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -33,10 +33,9 @@
return $$.ax.request({ url: `caseFeedback/listFeedback?id=` + id, type: 'get', service: 'mediate' });
}
-function getListCaseFlow(data) {
- return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
+function getListCaseFlow(caseId) {
+ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=` + caseId, type: 'get', service: 'mediate' });
}
-
const FileMessage = (props) => {
const caseTaskId = $$.getQueryString('caseTaskId')
@@ -68,6 +67,7 @@
const [progressData, setProgressData] = useState({});
useEffect(() => {
+ console.log(caseId, 'caseId')
getByCaseId(caseId);
getTransactResult(caseId);
getCaseInfo(caseId);
@@ -111,9 +111,7 @@
}
const getData = async (id) => {
- const res = await getListCaseFlow({
- caseId: id
- })
+ const res = await getListCaseFlow(id)
if (res.type) {
setProgressData(res.data)
}
@@ -196,7 +194,7 @@
</span>
}
>
- <ProgressStep progressData={progressData} hasTab={true}/>
+ <ProgressStep progressData={progressData} hasTab={true} />
</TabPane>
<TabPane
key='2'
--
Gitblit v1.8.0