From f486223abd99d48c1ef7a5b8df9812d2a24a2988 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 31 Aug 2024 16:43:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

---
 gz-customerSystem/src/views/register/matterDetail/index.jsx |   34 +++++++++++++++-------------------
 gz-customerSystem/src/views/register/visit/index.jsx        |   25 +++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 7c124e6..403d0c3 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -148,22 +148,18 @@
   //获取id
   const getCaseInfo = async () => {
     const res = await getCaseInfoApi('24083010062110001')
+
     if (res.type) {
       let data = res.data
       setInfoData([...fakeData1, {
         ...data,
-        // status:
-        // data.status === '1' ? '待签收' :
-        // data.status === '2' ? '待受理' :
-        // data.status === '3' ? '办理中' :
-        // data.status === '4' ? '结案审核' :
-        // data.status === '5' ? '待评价' :
-        // data.status === '6' ? '已归档' : '未知状态'
+        questionName: data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName + '/' + data.queVillageName,
+        caseType: data.caseTypeFirstName + '/' + data.caseTypeName
       }])
 
-      setInfoData(res.data)
     }
   }
+
 
   useEffect(() => {
     getCaseInfo()
@@ -217,47 +213,47 @@
             </Col>
             <Col span={8}>
               <div ><div className="title-text">纠纷类型</div></div>
-              <div>{infoData.caseTypeFirstName}/{infoData.caseTypeName}</div>
+              <div>{infoData.caseType || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">纠纷发生时间</div></div>
-              <div>{infoData.occurTime}</div>
+              <div>{infoData.occurTime || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">纠纷发生地点</div></div>
-              <div>广州市天河区中山七路康王柏德来商业城</div>
+              <div>{infoData.addr || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">问题属地</div></div>
-              {/* <div>{queProvName}/{queCityName}/{queAreaName}/{queRoadName}</div> */}
+              <div>{infoData.questionName || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">涉及人数(人)</div></div>
-              <div>2</div>
+              <div>{infoData.peopleNum || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">涉及金额(元)</div></div>
-              <div>{$$.thousands(20000)}</div>
+              <div>{$$.thousands(infoData.amount) || '-'}</div>
             </Col>
             <Col span={8}>
               <div ><div className="title-text">事项来源</div></div>
-              <div>大厅来访</div>
+              <div>{infoData.canalName || '-'}</div>
             </Col>
             <Col span={16}>
               <div ><div className="title-text">来访形式</div></div>
-              <div>来访</div>
+              <div>{infoData.visitWayName || '-'}</div>
             </Col>
             <Col span={24}>
               <div className="title"><div className="title-text">事项概况</div></div>
-              <div>张先生与李先生是多年的朋友关系。2023年4月,李先生因生意周转需要向张先生借款人民币20万元,并口头承诺于一年内还清。出于信任,张先生未要求签订书面借条或借款合同。然而,到了2024年4月,李先生并未如约归还借款。张先生多次通过电话、微信等方式催促还款,但李先生先是拖延,后干脆以各种理由拒绝偿还,甚至声称该笔款项属于赠予而非借款,这使得张先生感到十分无奈。 </div>
+              <div>{infoData.caseDes || '-'}</div>
             </Col>
             <Col span={24}>
               <div className="title"><div className="title-text">事项申请</div></div>
-              <div>张先生与李先生是多年的朋友关系。2023年4月,李先生因生意周转需要向张先生借款人民币20万元,并口头承诺于一年内还清。出于信任,张先生未要求签订书面借条或借款合同。然而,到了2024年4月,李先生并未如约归还借款。张先生多次通过电话、微信等方式催促还款,但李先生先是拖延,后干脆以各种理由拒绝偿还,甚至声称该笔款项属于赠予而非借款,这使得张先生感到十分无奈。 </div>
+              <div>{infoData.caseClaim || '-'}</div>
             </Col>
             <Col span={16}>
               <div className="title"><div className="title-text">是否重大矛盾纠纷</div></div>
-              <div>否</div>
+              <div>{infoData.majorStatus === '0' ? '否' : '是'}</div>
             </Col>
           </Row>
           <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}>
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 2372777..44b677c 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/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-08-28 14:38:20
+ * @LastEditTime: 2024-08-31 16:41:02
  * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
  * @Description: 来访登记
  */
@@ -10,6 +10,7 @@
 import React, { useState, useRef, Fragment } from "react";
 import NewPage from '@/components/NewPage';
 import * as $$ from '@/utils/utility';
+import { Matter, transfer } from '@/assets/icon';
 import "@arco-themes/react-gzzz/css/arco.css";
 import '../index.less';
 import { Space } from 'antd';
@@ -36,7 +37,27 @@
 	const formRef = useRef();
 
 	const [isReview, setIsReview] = useState(false);//预览页面控制
-	const [current, setCurrent] = useState(1);
+	const [current, setCurrent] = useState(3);
+	const [tabsActive, setTabsActive] = useState('1');
+	const [tabsList, setTabList] = useState([
+		{
+			img: Matter,
+			label: '事项详情',
+			key: '1'
+		},
+		{
+			img: transfer,
+			label: '流转办理',
+			key: '2',
+			isNeedStep: true,//加上这个就有进度条
+		},
+	])
+	const breadcrumbDataMap = {
+		1: { breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' },
+		2: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' },
+		3: { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
+	}
+	// const [current, setCurrent] = useState(1);
 
 	//提交信息,需要校验规则
 	const handleSubmit = async () => {

--
Gitblit v1.8.0