From 68f41dad70cc9c90b87258d91300576d7f5682e7 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Sat, 14 Sep 2024 15:58:38 +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 |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index a2cbdbf..8f5a353 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -225,8 +225,8 @@
     },
     {
       title: '回退部门',
-      dataIndex: 'backUnit',
-      key: 'backUnit',
+      dataIndex: 'organizingUnit',
+      key: 'organizingUnit',
       width: 150,
     },
     {
@@ -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>
               ),
             }]),
@@ -954,7 +954,7 @@
               title: '督办部门',
               dataIndex: 'caseGrade',
               key: 'caseGrade',
-              width: 80,
+              width: 110,
             },
             {
               title: '督办意见',
@@ -1020,7 +1020,7 @@
               title: '督办部门',
               dataIndex: 'caseGrade',
               key: 'caseGrade',
-              width: 80,
+              width: 110,
             },
             {
               title: '督办意见',
@@ -1122,6 +1122,7 @@
       $$.infoSuccess({ content: '签收成功' });
       getCountData();
       getTableData(tabActivekey)
+      navigate(`/mediate/visit/eventFlow?caseTaskId=${ownerId}&caseId=${caseId}`)
     }
   }
 
@@ -1150,7 +1151,7 @@
         break;
       case '4'://办理中
         const { status, ...most } = searchData
-        if (status && status === '0') {
+        if (status && status === '2') {
           res = await pageMyTaskBlzApi({
             ...pageData,
             ...most
@@ -1203,7 +1204,13 @@
         status: '0',
         type: 1
       })
-    } else if (key == '4' || key == '6') {
+    } else if (key == '4') {
+      setSearchData({
+        sortType: 1,
+        sortColmn: 1,
+        status: '2',
+      })
+    } else if (key == '6') {
       setSearchData({
         sortType: 1,
         sortColmn: 1,
@@ -1218,6 +1225,7 @@
     }
     setTabActivekey(key);
     setTableTab(data.tabList)
+    getCountData();
   }
 
   //获取工作总览数据
@@ -1346,7 +1354,7 @@
                 </span>
               }
             >
-              <Typography.Paragraph key={item.value}>
+              <Typography.Paragraph key={tabActivekey + item.value}>
                 {tabActivekey == '5' &&
                   <Radio.Group
                     type='button'

--
Gitblit v1.8.0