From a52d2b801ac2aa6148ae78a5306a13a354abf7d2 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 13 Sep 2024 18:32:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

---
 gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 252ab71..47faac2 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -10,12 +10,17 @@
 import MatterDetail from '../../matterDetail';
 import SupervisingView from "../../matterDetail/Supervising";
 import * as $$ from '@/utils/utility';
+import { useNavigate } from 'react-router-dom';
 
 const TabPane = Tabs.TabPane;
 const Step = Steps.Step;
 
-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' });
+}
+
+function accept(data) {
+  return $$.ax.request({ url: `caseTask/accept`, type: 'post', service: 'mediate', data });
 }
 
 export default function EventFlow(props) {
@@ -23,14 +28,22 @@
     {
       label: '受理',
       type: 'primary',
-      click: () => { },
+      click: () => {
+        Modal.confirm({
+          title: '受理确认',
+          content: '确认受理该事件？',
+          onOk: async () => {
+            const res = await accept({
+              caseTaskId: props.caseTaskId
+            })
+            if (res.type) {
+              $$.infoSuccess({ content: '受理成功！' });
+              navigate(`/mediate/visit/handleFeedback?caseTaskId=${props.caseTaskId}&caseId=${props.caseId}`)
+            }
+          },
+        });
+      },
       key: 'sl',
-    },
-    {
-      label: '提交',
-      type: 'primary',
-      click: () => { },
-      key: 'tj',
     },
     {
       label: '自行受理',
@@ -59,6 +72,7 @@
     },
   ]
   const scrollRef = useRef(null)
+  const navigate = useNavigate();
   const [backVisible, setBackVisible] = useState(false)
   const [height, setHeight] = useState(500)
   const [escalationVisible, setEscalationVisible] = useState(false)
@@ -92,10 +106,8 @@
   }, [])
 
   const onWindowResize = () => {
-    let offsetLeft = 0;
     let offsetTop = 0;
     if (scrollRef.current.container) {
-      offsetLeft = getOffset(scrollRef.current.container).left;
       offsetTop = getOffset(scrollRef.current.container).top;
     }
     setHeight(getSize().windowH - offsetTop - 16)
@@ -103,13 +115,16 @@
 
   //获取流程信息
   const getData = async () => {
-    const res = await getListCaseFlow({
-      caseId: props.caseId
-    })
-    if(res.type) {
+    const res = await getListCaseFlow(
+      props.caseId
+    )
+    if (res.type) {
       setProgressData(res.data)
     }
   }
+
+
+
 
   return (
     <Fragment>
@@ -130,8 +145,8 @@
           ref={scrollRef}
           autoHide
         >
-          <MatterDetail caseId={props.caseId}/>
-          <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}>
+          <MatterDetail caseId={props.caseId} />
+          <div className='dataSync-hasTabPage' style={{ marginTop: '-8px', paddingBottom: '64px' }}>
             <Tabs defaultActiveTab='1' >
               <TabPane
                 key='1'
@@ -148,7 +163,7 @@
                 title={
                   <span style={{ fontSize: '15px' }}>
                     督办信息
-                    <Badge maxCount={99} count={1000} />
+                    {/* <Badge maxCount={99} count={1000} /> */}
                   </span>
                 }
               >
@@ -168,7 +183,7 @@
           unmountOnExit={true}
           maskClosable={false}
         >
-          <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }}/>
+          <BackModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setBackVisible(false) }} />
         </Modal>
         <Modal
           title='上报'
@@ -179,7 +194,7 @@
           unmountOnExit={true}
           maskClosable={false}
         >
-          <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }}/>
+          <EscalationModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setEscalationVisible(false) }} />
         </Modal>
         <Modal
           title='交办'
@@ -192,15 +207,15 @@
           autoFocus={false}
           focusLock={false}
         >
-          <AssignedModel caseId={props.caseId} onCancel={() => { setAssignedVisible(false) }}/>
+          <AssignedModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setAssignedVisible(false) }} />
         </Modal>
         <div className="dataSync-excel">
-          <Space size="large" style={{ margin: '4px 14px' }}>
+          <Space size="middle" style={{ margin: '4px 14px' }}>
             {staticButtonList?.map(item => {
               const { label, key, click, ...rest } = item;
               return <Button key={key} onClick={click} {...rest} >{label}</Button>
             })}
-            <Button type='secondary' >返回上级页面</Button>
+            <Button type='secondary'  onClick={() => navigate(-1)}>返回上级页面</Button>
           </Space>
         </div>
       </div>

--
Gitblit v1.8.0