From ccbe1710b9c52b0ca23150b0a9ca763da6e1223c Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 12 Sep 2024 15:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/visit/index.jsx | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 74a56cc..697c971 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,13 +2,13 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-07 17:27:08
+ * @LastEditTime: 2024-09-12 14:39:18
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
import React, { useState, useRef, Fragment, useEffect } from "react";
-import { useSearchParams, useNavigate } from 'react-router-dom';
+import { useParams, useNavigate } from 'react-router-dom';
import NewPage from '@/components/NewPage';
import * as $$ from '@/utils/utility';
import "@arco-themes/react-gzzz/css/arco.css";
@@ -17,24 +17,23 @@
import { Button, Steps, Message } from '@arco-design/web-react';
import VisitorRegister from './component/visitorRegister';
import Preview from './preview';
-import { useParams } from 'react-router-dom';
const Step = Steps.Step;
function saveDispute(data) {
- return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
+ return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
}
function getId() {
- return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
+ return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
}
function submitDispute(data) {
- return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
+ return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
}
function getDetailData(id) {
- return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
+ return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
}
@@ -89,12 +88,19 @@
if (!errors) {
const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
const params = handleData(rest)
- reauestSubmit({
- ...params,
- isSelfAccept: 0,
- isDraft: 0,
- operateType: 0,
- })
+ $$.modalInfo({
+ title: '提醒',
+ content: '确定提交吗？',
+ cancelText: '我再想想',
+ onOk: () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
+ })
+ },
+ });
}
});
}
@@ -169,6 +175,7 @@
const response = await submitDispute(data)
if (response.type) {
Message.success('提交成功！')
+ navigate(`/mediate/visit/visitWorkBench`, { replace: true })
setCurrent(2)
}
}
@@ -191,7 +198,9 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} />
+ <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 82px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}>
+ <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} mainId={id} />
+ </div>
<VisitorRegister
formRef={formRef}
style={{ display: isReview ? 'none' : '' }}
@@ -200,12 +209,12 @@
fileInfoList={editData.fileInfoList}
/>
<div className="dataSync-excel">
- <Space size="large" style={{ margin: '4px 14px' }}>
+ <Space size="middle" style={{ margin: '4px 14px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>{isReview ? '修改' : '预览'}</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
- <Button type='secondary' onClick={handleReview}>返回上级页面</Button>
+ <Button type='secondary' onClick={() => { navigate(-1) }}>返回上级页面</Button>
</Space>
</div>
</Fragment>
--
Gitblit v1.8.0