From 842f0a4df6b10d70512e6bf48c99c54987c3bd25 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 10 Sep 2024 20:37:46 +0800
Subject: [PATCH] 流程
---
gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx | 7 ++-
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 8 ++-
gz-customerSystem/src/views/register/closingReview/index.jsx | 20 +++++++++-
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 1
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 33 ++++++++++++----
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 4 +
gz-customerSystem/src/views/register/index.jsx | 23 +++++------
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 20 +++++++---
8 files changed, 80 insertions(+), 36 deletions(-)
diff --git a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
index 8a2b746..14fee11 100644
--- a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
@@ -58,7 +58,7 @@
value: '4'
},
]
-
+ console.log(props.id,'props.idprops.id')
useEffect(() => {
getInfoData()
getAppId()
@@ -97,7 +97,7 @@
if (!errors) {
const { file, myNoUp, ...rest } = formRef.current.getFields()
requestSubmit({
- id,
+ id: props.id,
caseId: props.caseId,
caseTaskId: props.caseTaskId,
...rest
@@ -111,7 +111,8 @@
const res = await submit(data)
if (res.type) {
$$.infoSuccess({ content: '提交成功！' });
- navigate(`/mediate/visit/visitWorkBench`) }
+ 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 a9dfa4f..a4c2a37 100644
--- a/gz-customerSystem/src/views/register/closingReview/index.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/index.jsx
@@ -16,6 +16,10 @@
return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=${caseTaskId}`, type: 'get', service: 'mediate' });
}
+function getCaseInfoApi(id) {
+ return $$.ax.request({ url: '/caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+}
+
const myTab = [
{
img: Matter,
@@ -36,13 +40,17 @@
const ClosingReview = () => {
const caseId = $$.getQueryString('caseId')
const caseTaskId = $$.getQueryString('caseTaskId')
+ const windupId = $$.getQueryString('windupId')
+
const routeData = useParams();
const [authorData, setAuthorData] = useState({});
const [tabsList, setTabsList] = useState([]);
const [tabsActive, setTabsActive] = useState();
+ const [newId, setNewId] = useState(caseId)
useEffect(() => {
- getAuthor()
+ getAuthor();
+ getCaseInfo()
console.log(caseId,caseTaskId,'caseId','caseTaskId')
}, [])
@@ -68,6 +76,14 @@
}
}
+ const getCaseInfo = async (id) => {
+ const res = await getCaseInfoApi(caseId)
+ if(res.type){
+ console.log(res.data?.id,'res.data?.idres.data?.id')
+ setNewId(res.data?.id)
+ }
+ }
+
//根据id定义组件
const getTypeDom = (key) => {
if (key === 'dslxq' || key === 'sxxq') {
@@ -77,7 +93,7 @@
return <ApplyInfo />
}
if (key === 'jash') {
- return <ReviewExamine caseTaskId={caseTaskId} caseId={caseId} />
+ return <ReviewExamine caseTaskId={caseTaskId} caseId={caseId} id={windupId} />
}
}
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 807b3da..777573e 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -38,6 +38,7 @@
})
if (res.type) {
$$.infoSuccess({ content: '受理成功！' });
+ navigate('/mediate/visit/visitWorkBench')
}
},
});
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index f52769e..cc9155e 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
@@ -2,11 +2,12 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-02 14:49:13
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 15:46:08
+ * @LastEditTime: 2024-09-10 19:16:46
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
import React, { useState, useRef } from 'react';
+import { useNavigate } from 'react-router-dom';
import { Modal, Form, Select, Upload, Input } from '@arco-design/web-react';
import { Col, Space, Button, Tooltip, Radio, Row } from 'antd';
import DocumentScanner from '../../matterDetail/FileUpLoad'
@@ -18,6 +19,7 @@
import * as $$ from '@/utils/utility';
const appUrl = $$.appUrl;
+
const FormItem = Form.Item;
function windupApplyApi(data) {
@@ -28,6 +30,7 @@
const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId, caseTaskId }) => {
const formRef = useRef();
+ const navigate = useNavigate();
const formRefWrite = useRef();
const failRef = useRef();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
@@ -113,24 +116,29 @@
console.log(
{
mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
- agreeType: value === 1 ? '口头协议' : '书面协议',
+ mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2',
+ agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2',
+ agreeTypeName: value === 1 ? '口头协议' : '书面协议',
caseTaskId: caseTaskId,
caseId: caseId,
caseResultId: caseResultId,
...submitData
- },'windupApplyData'
+ }, 'windupApplyData'
)
const res = await windupApplyApi({
mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
- agreeType: value === 1 ? '口头协议' : '书面协议',
+ mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2',
+ agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2',
+ agreeTypeName: value === 1 ? '口头协议' : '书面协议',
caseTaskId: caseTaskId,
caseId: caseId,
caseResultId: caseResultId,
...submitData
- })
+ })
if (res.type) {
$$.infoSuccess({ content: '提交成功' });
- handleOnCancel()
+ handleOnCancel();
+ navigate('/mediate/visit/visitWorkBench')
}
}
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 3db9acb..93ee1b7 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -189,7 +189,7 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi('2105180249501982')
+ const res = await getByIdRoleApi(caseId)
setPersonData(res.data)
}
@@ -215,7 +215,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
} else {
const res = await saveFeedbackApi({
@@ -226,7 +227,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
}
}
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 99f4559..b04ba49 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 16:22:30
+ * @LastEditTime: 2024-09-10 19:11:33
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*
@@ -44,6 +44,10 @@
return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
}
+function getCaseInfoApi(id) {
+ return $$.ax.request({ url: '/caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+}
+
const Organization = () => {
@@ -54,7 +58,8 @@
const [tabsActive, setTabsActive] = useState('sxxq');
const [AiQuestionView, setAiQuestionView] = useState(false)
const [aiData, setAiData] = useState([])
- const [aiLawData, setAiLawData] = useState([])
+ const [aiLawData, setAiLawData] = useState([]);
+ const [caseDetailAi, setCaseDetailAi] = useState({});
const [caseDetailView, setCaseDetail] = useState({})
const [authorData, setAuthorData] = useState({});
const [disTab, setDisTab] = useState(true);
@@ -84,9 +89,9 @@
const getCase = async () => {
const res = await getCaseApi({
- caseDes: '牛某某诉称：其在上海某物流有限公司（以下简称物流公司）担任叉车工。某日上班与领导的车辆碰擦，对方全责，领导要求私了，因其未同意而被物流公司开除。物流公司解除劳动合同违法，应当支付赔偿金。物流公司辩称：物流公司要求劳动者“健康”，牛某某持有残疾证，影响其从事叉车工作。牛某某入职前故意隐瞒身体残疾的情况，有违诚信，入职后以此为由索要优待未果，辱骂领导。物流公司并非因牛某某身体残疾而解除，而是因其隐瞒持有残疾证及威胁领导，解除劳动合同合法。法院经审理查明，牛某某左手大拇指部分缺失，其于2019年10月10日到物流公司工作，担任叉车工。牛某某入职时提交了在有效期内的叉车证，并参加了入职体检，体检合格。物流公司要求填写员工登记表，登记表上列明有无大病病史、家族病史、工伤史、传染病史，并列了“其他”栏。牛某某均勾选了“无”。牛某某正常完成了工作。2020年7月4日，物流公司以牛某某隐瞒持有残疾证，且威胁领导恐吓上级，属于严重违纪为由解除劳动合同。2020年7月10日，牛某某向上海市浦东新区劳动人事争议仲裁委员会申请仲裁，要求物流公司支付违法解除劳动合同赔偿金30,000元。审理中牛某某表示，其可以正常工作，并不要求物流公司额外支付残疾人的福利待遇，所以没有告知物流公司其身有残疾。2020年10月13日，该仲裁委员会按牛某某工资2,930元为标准裁决物流公司支付牛某某违法解除劳动合同赔偿金5,860元。',
- caseClaim: '牛某某向一审法院起诉请求物流公司支付其违法解除劳动合同赔偿金30,000元。',
- caseId: '10086'
+ caseDes: caseDetailAi?.caseDes,
+ caseClaim: caseDetailAi?.caseClaim,
+ caseId: caseId
})
console.log(res.data, 'res')
if (res.type) {
@@ -96,9 +101,9 @@
const getLaw = async () => {
const res = await getLawApi({
- caseDes: '牛某某诉称：其在上海某物流有限公司（以下简称物流公司）担任叉车工。某日上班与领导的车辆碰擦，对方全责，领导要求私了，因其未同意而被物流公司开除。物流公司解除劳动合同违法，应当支付赔偿金。物流公司辩称：物流公司要求劳动者“健康”，牛某某持有残疾证，影响其从事叉车工作。牛某某入职前故意隐瞒身体残疾的情况，有违诚信，入职后以此为由索要优待未果，辱骂领导。物流公司并非因牛某某身体残疾而解除，而是因其隐瞒持有残疾证及威胁领导，解除劳动合同合法。法院经审理查明，牛某某左手大拇指部分缺失，其于2019年10月10日到物流公司工作，担任叉车工。牛某某入职时提交了在有效期内的叉车证，并参加了入职体检，体检合格。物流公司要求填写员工登记表，登记表上列明有无大病病史、家族病史、工伤史、传染病史，并列了“其他”栏。牛某某均勾选了“无”。牛某某正常完成了工作。2020年7月4日，物流公司以牛某某隐瞒持有残疾证，且威胁领导恐吓上级，属于严重违纪为由解除劳动合同。2020年7月10日，牛某某向上海市浦东新区劳动人事争议仲裁委员会申请仲裁，要求物流公司支付违法解除劳动合同赔偿金30,000元。审理中牛某某表示，其可以正常工作，并不要求物流公司额外支付残疾人的福利待遇，所以没有告知物流公司其身有残疾。2020年10月13日，该仲裁委员会按牛某某工资2,930元为标准裁决物流公司支付牛某某违法解除劳动合同赔偿金5,860元。',
- caseClaim: '牛某某向一审法院起诉请求物流公司支付其违法解除劳动合同赔偿金30,000元。',
- caseId: '10086'
+ caseDes: caseDetailAi?.caseDes,
+ caseClaim: caseDetailAi?.caseClaim,
+ caseId: caseId
})
if (res.type) {
setAiLawData(res.data)
@@ -131,10 +136,22 @@
}
}
+ const getCaseInfo = async (id) => {
+ const res = await getCaseInfoApi(id)
+ if (res.type) {
+ console.log(res, 'res')
+ let caseDes = res.data.caseDes;
+ let caseClaim = res.data.caseClaim;
+ setCaseDetailAi({ caseDes: caseDes, caseClaim: caseClaim })
+
+ }
+ }
+
useEffect(() => {
+ getCaseInfo(caseId)
getAuthor();
getCase();
getLaw();
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 28dc3a6..78a9971 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 16:58:03
+ * @LastEditTime: 2024-09-10 20:29:15
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -395,7 +395,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -452,7 +451,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -498,7 +496,7 @@
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
- </Space>
+ </Space>
),
},
];
@@ -508,7 +506,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -554,7 +551,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={() => handleSign(record.caseId, record.ownerId)}>签收</div>
+ <div onClick={() => handleSign(record.caseId, record.ownerId)} style={{ cursor: 'pointer' }}>签收</div>
</Space>
),
},
@@ -565,7 +562,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -797,7 +793,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer',color: '#1A6FB8' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>处理</div>
</Space>
),
@@ -880,7 +876,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '回复时限',
@@ -1008,7 +1003,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/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}&windupId=${record.windupId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
@@ -1018,6 +1013,8 @@
const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
if (res.type) {
$$.infoSuccess({ content: '签收成功' });
+ getCountList();
+ pageMyTaskFpNew()
}
}
@@ -1085,7 +1082,7 @@
}
if (tabActivekey === '4') {
setColumnType(caseResultApply)
- pageMyTaskBl('1')
+ pageMyTaskBl('0')
}
}
if (type === '1') {
@@ -1097,7 +1094,7 @@
if (type === '3') {
if (tabActivekey === '4') {
setColumnType(backColumn)
- pageMyTaskBl('2')
+ pageMyTaskBl('1')
}
}
@@ -1291,7 +1288,7 @@
自行排查
<div style={{ display: 'flex', justifyContent: 'space-evenly' }}>
<div className='bottomTab1'>
- <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD' }}>大厅来访</div>
+ <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD',cursor:'pointer' }}>大厅来访</div>
<img src={visitInto} alt='' className='VisitWorkBench-bottom-img' />
</div>
<div className='bottomTab2'>
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 97153d1..88c6b7d 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -13,6 +13,7 @@
import RateModule from './RateModule';
import RegisInfoModule from './RegisInfoModule';
import SupervisingView from "./Supervising";
+import { useNavigate } from 'react-router-dom';
const Step = Steps.Step;
const TabPane = Tabs.TabPane;
@@ -38,6 +39,7 @@
}
const FileMessage = (props) => {
+ const navigate = useNavigate();
const caseTaskId = $$.getQueryString('caseTaskId')
const caseId = $$.getQueryString('caseId')
const [tabsActive, setTabsActive] = useState('1');
@@ -177,7 +179,7 @@
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type='primary' >导出</Button>
- <Button type='secondary' >返回上级页面</Button>
+ <Button type='secondary'onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
</>
--
Gitblit v1.8.0