From ec720735f47ec0f9ffae7e84b1189bc9a7b1c6ed Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Tue, 03 Sep 2024 17:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/assets/images/apply.png | 0
gz-customerSystem/src/assets/images/index.js | 6 +
gz-customerSystem/src/assets/images/icon/result.svg | 7 +
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 81 ++++++++++++++++++++
gz-customerSystem/src/assets/images/icon/index.js | 4
gz-customerSystem/src/router/router.js | 6 +
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 4
gz-customerSystem/src/views/register/matterDetail/index.jsx | 6
gz-customerSystem/src/components/ArcoUpload/index.jsx | 2
gz-customerSystem/src/views/register/index.less | 8 +
gz-customerSystem/src/assets/images/Frame.svg | 7 +
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 25 +++---
gz-customerSystem/src/views/register/visit/component/levelDetail.jsx | 35 ++++----
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 2
14 files changed, 152 insertions(+), 41 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/Frame.svg b/gz-customerSystem/src/assets/images/Frame.svg
new file mode 100644
index 0000000..bd7dc9a
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/Frame.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6667 2H7.33337V14H10.6667V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M14 2H10.6666V14H14V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M3.33333 2L6 2.33333L4.83333 14L2 13.6667L3.33333 2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M12.3334 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/gz-customerSystem/src/assets/images/apply.png b/gz-customerSystem/src/assets/images/apply.png
new file mode 100644
index 0000000..c7886b8
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/apply.png
Binary files differ
diff --git a/gz-customerSystem/src/assets/images/icon/index.js b/gz-customerSystem/src/assets/images/icon/index.js
index 8e9d79e..e27920d 100644
--- a/gz-customerSystem/src/assets/images/icon/index.js
+++ b/gz-customerSystem/src/assets/images/icon/index.js
@@ -143,6 +143,7 @@
//大厅来访
import scan from './scan.svg'
+import result from './result.svg'
export {
mediationCenter,
@@ -267,5 +268,6 @@
registerChooseModal_3,
registerChooseModal_4,
qrCodeImg,
- scan
+ scan,
+ result
};
diff --git a/gz-customerSystem/src/assets/images/icon/result.svg b/gz-customerSystem/src/assets/images/icon/result.svg
new file mode 100644
index 0000000..bd7dc9a
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/icon/result.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6667 2H7.33337V14H10.6667V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M14 2H10.6666V14H14V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M3.33333 2L6 2.33333L4.83333 14L2 13.6667L3.33333 2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
+<path d="M12.3334 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/gz-customerSystem/src/assets/images/index.js b/gz-customerSystem/src/assets/images/index.js
index daa12d4..ea64e75 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -53,7 +53,8 @@
import feedback from "./feedback.png";
import fold from "./fold.png";
import down from "./down.png";
-import tip from "./tip.png"
+import tip from "./tip.png";
+import apply from "./apply.png";
export {
ledger_1,
@@ -102,5 +103,6 @@
feedback,
fold,
down,
- tip
+ tip,
+ apply
};
\ No newline at end of file
diff --git a/gz-customerSystem/src/components/ArcoUpload/index.jsx b/gz-customerSystem/src/components/ArcoUpload/index.jsx
index e9f5cca..58c5ac1 100644
--- a/gz-customerSystem/src/components/ArcoUpload/index.jsx
+++ b/gz-customerSystem/src/components/ArcoUpload/index.jsx
@@ -31,7 +31,7 @@
const handleFileListChange = (fileList) => {
setMyFileList(fileList);
if (props.onFileListChange) {
- props.onFileListChange(fileList.length);
+ props.onFileListChange(fileList);
}
};
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index 61f7003..e130197 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-28 11:22:41
- * @LastEditTime: 2024-08-31 17:09:28
+ * @LastEditTime: 2024-09-03 14:58:33
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 路由
@@ -140,6 +140,8 @@
import EventFlow from "../views/register/eventFlow";
//办理反馈
import HandleFeedback from "../views/register/handleFeedback";
+//档案信息
+import FileMessage from "../views/register/matterDetail/fileMessage";
import Test from "../views/test";
@@ -215,8 +217,10 @@
<Route path="visit/:id?" element={<Visit />} />
<Route path="visit/eventFlow" element={<EventFlow />} />
<Route path="visit/handleFeedback" element={<HandleFeedback />} />
+ <Route path="visit/fileMessage" element={<FileMessage />} />
+
{/* 工作流模块 */}
<Route path="workflowTemplate" element={<WorkflowTemplate />} />
<Route path="workflowTemplate/workflowTemplateEdit" element={<WorkflowTemplateEdit />} />
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index 81483be..396f274 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-02 20:52:05
+ * @LastEditTime: 2024-09-03 14:44:14
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
@@ -326,7 +326,7 @@
<FormItem
label={<div style={{ display: 'flex' }}>
无法化解理由
- <Tooltip onClick={() => setNoHandleReason(true)}>
+ <Tooltip onClick={() => setNoHandleReason(!noHandleReason)}>
<img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
</Tooltip>
<div className="must" style={{ marginLeft: '4px' }}>必填</div>
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 4958df4..00b2ace 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/index.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-02 14:31:31
+ * @LastEditTime: 2024-09-03 14:44:51
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index aecb74d..3dd2694 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -443,4 +443,10 @@
display: flex;
gap: 8px;
margin-bottom: 8px;
-}
\ No newline at end of file
+}
+
+.MyDrawer{
+ position:absolute;
+ z-index: 9999;
+}
+
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
new file mode 100644
index 0000000..7038876
--- /dev/null
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -0,0 +1,81 @@
+import React,{useState} from 'react';
+import NewPage from '@/components/NewPage';
+import { Steps, Tabs } from '@arco-design/web-react';
+import {apply} from '@/assets/images';
+import {result} from '@/assets/images/icon';
+
+const Step = Steps.Step;
+const TabPane = Tabs.TabPane;
+
+
+const FileMessage = (props) => {
+
+ const [tabsActive, setTabsActive] = useState('1');
+ const [current, setCurrent] = useState(6);
+ const [tabsList, setTabList] = useState([
+ {
+ img: result,
+ label: '档案信息',
+ key: '1'
+ },
+ {
+ img: apply,
+ label: '申请记录',
+ key: '2',
+ isNeedStep: true,//加上这个就有进度条
+ },
+ ])
+
+
+ return (
+ <>
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '详情' }
+ }
+ >
+ <Tabs
+ defaultActiveTab='1'
+ onChange={(v) => setTabsActive(v)}
+ className='myTabContent'
+ >
+ {tabsList?.map(item => {
+ return <TabPane
+ key={item.key}
+ title={
+ <span>
+ {tabsActive === item.key && <img src={item.img} alt="" style={{ width: '16px', height: '16px', margin: '-5px 12px 0px 0px' }} />}
+ <span style={{ fontSize: '16px' }}>{item.label}</span>
+ </span>
+ }
+ >
+ {
+ item.isNeedStep && <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
+ <Steps type='navigation' current={current}>
+ <Step title='来访登记' disabled />
+ <Step title='事件流转' disabled />
+ <Step title='办理反馈' disabled />
+ <Step title='结案审核' disabled />
+ <Step title='当事人评价' disabled />
+ <Step title='结案归档' disabled />
+ </Steps>
+ </div>
+ }
+ {tabsActive === '1' &&
+ <></>
+ }
+ {
+ tabsActive === '2' &&
+ <></>
+ }
+ </TabPane>
+ })}
+ </Tabs>
+
+
+ </NewPage>
+ </>
+ )
+}
+
+export default FileMessage;
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 972716b..8e3cd09 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -162,9 +162,9 @@
}
- useEffect(() => {
- getCaseInfo()
- }, [])
+ // useEffect(() => {
+ // getCaseInfo()
+ // }, [])
return (
<div style={{ position: 'relative' }}>
diff --git a/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx b/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
index 4152a2a..4e10275 100644
--- a/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/levelDetail.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-27 16:47:12
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-02 20:21:12
+ * @LastEditTime: 2024-09-03 14:35:13
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\levelDetail.jsx
* @Description: 右抽屉提示
*/
@@ -79,21 +79,24 @@
const NoHandleReason = ({ visible, onClose }) => {
return (
- <MyDrawer
- visible={visible}
- onClose={onClose}
- title="无法化解理由"
- width={1000}
- style={{ position: 'absolute' }}
- bodyStyle={{ marginTop: '-8px' }}
- titleBefore={true}
- >
- <div style={{ marginTop: '-8px' }}>
- 完整的无法化解理由至少应具备3要素：调解过程中提供的解决方案+调解过程中的主要分歧点+最终难以调和的原因
- 例如：
- 调解工作于2024年1月10日在某街道人民调解委员会进行，双方当事人均到场参与。调解员首先听取了双方当事人的陈述，随后进行了多次单独会谈，根据被申请方的实际情况提出分期支付欠款的解决方案。在调解过程中，双方就具体支付方式进行了反复讨论，但未能达成一致意见。双方的主要分歧点在与被申请方不想一次性支付欠款。双方在沟通过程中情绪激动，互不相让。尽管调解员尝试缓和气氛，并引导双方从利益出发寻求解决方案，但双方仍坚持各自的立场，不愿妥协。
- </div>
- </MyDrawer>
+ <div className='MyDrawer'>
+ <MyDrawer
+ visible={visible}
+ onClose={onClose}
+ title="无法化解理由"
+ width={1000}
+ style={{ position: 'absolute' }}
+ bodyStyle={{ marginTop: '-8px' }}
+ titleBefore={true}
+ >
+ <div style={{ marginTop: '-8px' }}>
+ 完整的无法化解理由至少应具备3要素：调解过程中提供的解决方案+调解过程中的主要分歧点+最终难以调和的原因
+ 例如：
+ 调解工作于2024年1月10日在某街道人民调解委员会进行，双方当事人均到场参与。调解员首先听取了双方当事人的陈述，随后进行了多次单独会谈，根据被申请方的实际情况提出分期支付欠款的解决方案。在调解过程中，双方就具体支付方式进行了反复讨论，但未能达成一致意见。双方的主要分歧点在与被申请方不想一次性支付欠款。双方在沟通过程中情绪激动，互不相让。尽管调解员尝试缓和气氛，并引导双方从利益出发寻求解决方案，但双方仍坚持各自的立场，不愿妥协。
+ </div>
+ </MyDrawer>
+
+ </div>
)
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 7f00626..e6af7c8 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -40,19 +40,16 @@
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [scanFile, setScanFile] = useState(false);
- const [scanImage, setScanImage] = useState(false);
- const [scaned, setScaned] = useState(false);
const [upload, setUpLoad] = useState(false);
const [sourceType, setSourceType] = useState('1');
const [filesCheck, setFilesCheck] = useState(false);
- const [fileView, setFileView] = useState();
- const [fileTip, setFileTip] = useState('0');
const [mapView, setMapView] = useState(false);
const [visible, setVisible] = useState(false);
const [apply, setApply] = useState(false);
const [editData, setEditData] = useState(null);
const [agentVisible, setAgentVisible] = useState(false);
const [fileLength, setFileLength] = useState('');
+ const [matterNumber, setMatterNumber] = useState('');
const peopleMap = {
'15_020008-1': '申请方',
'15_020008-2': '被申请方',
@@ -119,11 +116,10 @@
label='身份证明材料'
editData={props.editData}
handleDelFile={handleDelFile}
- onFileListChange={(v) => setFileLength(v)}
- fileTip
+ onFileListChange={(v) => { setFileLength(v); console.log(v, 'vvsetFileLength') }}
/>
- {fileLength && <div style={{ position: 'absolute', top: '233px', left: '16px', color: '#86909C' }} > 申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength}</span></div>}
- </Col >
+ {fileLength.length > 0 && <div style={{ position: 'absolute', top: '233px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength.length}</span></div>}
+ </Col>
</>
)
}
@@ -136,7 +132,7 @@
params={{
action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00014-2`,
}}
- field='file'
+ field='file1'
handleChangeFile={handleChangeFile}
label='身份证明材料'
editData={props.editData}
@@ -218,7 +214,8 @@
width: 180,
render: (text) => (
<>
- {text}份
+ {text}
+ {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
</>
)
@@ -327,6 +324,8 @@
setDialogType(value.perType)
setEditData(value)
}
+
+ console.log(sourceType, 'sourceType')
return (
@@ -615,11 +614,11 @@
<Row gutter={[32, 0]}>{formType(sourceType)}</Row>
</Form>
</Col>
- <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }}>上传完成</Button>
+ <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength.length); setUpLoad(false) }}>上传完成</Button>
</Row>
</div>
- </Modal>
+ </Modal >
<Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
{/* <div className="mediationWindow-modal-main" style={{ display: 'flex' }}> */}
<div style={{ marginTop: '-16px' }}>
@@ -701,7 +700,7 @@
visible={apply}
onClose={() => setApply(false)}
/>
- </div>
+ </div >
)
}
--
Gitblit v1.8.0