From 8c7d843afaa32fc77204e86e1fa80e1abe0756d9 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 10 Sep 2024 10:36:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx | 2 +-
gz-customerSystem/src/api/appUrl.js | 6 +++---
gz-customerSystem/src/views/register/eventFlow/index.jsx | 2 +-
gz-customerSystem/src/views/register/visit/index.jsx | 3 ++-
gz-customerSystem/src/views/register/index.jsx | 6 +++---
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index c9ebe9d..8045a55 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-09-10 10:22:05
+ * @LastEditTime: 2024-09-10 10:36:24
* @LastEditors: lwh
* @Version: 1.0.0
* @Description: api地址
@@ -10,11 +10,11 @@
export const debug = {
// web服务
// baseUrl: 'http://gz.hugeinfo.com.cn',
- baseUrl: "http://6dycet.natappfree.cc",
+ baseUrl: "http://192.168.3.108:9002",
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- fileUrl: "http://6dycet.natappfree.cc",
+ fileUrl: "http://192.168.3.108:9002",
// fileUrl: 'http://gz.hugeinfo.com.cn',
// 文件查看url 后面接附件编号
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
index ce47fb4..b815c0e 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
@@ -154,7 +154,7 @@
<Col span={24} className="doubleFile">
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.caseId}&ownerId=${routeData.caseTaskId}&ownerType=22_00018-501`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.caseId}&ownerId=${props.caseId}&ownerType=22_00018-501`,
}}
field='file'
label='附件材料'
diff --git a/gz-customerSystem/src/views/register/eventFlow/index.jsx b/gz-customerSystem/src/views/register/eventFlow/index.jsx
index b96e734..36b134a 100644
--- a/gz-customerSystem/src/views/register/eventFlow/index.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/index.jsx
@@ -123,7 +123,7 @@
{getTypeDom(item.key)}
</TabPane>
})}
- </Tabs> : <EventFlow authorData={authorData} />
+ </Tabs> : <EventFlow authorData={authorData} caseId={caseId} />
}
</NewPage>
</div>
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 26359b2..7291421 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-09 22:29:34
+ * @LastEditTime: 2024-09-10 10:17:00
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -428,8 +428,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 74a56cc..e00c310 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-09-07 17:27:08
+ * @LastEditTime: 2024-09-10 10:10:03
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -169,6 +169,7 @@
const response = await submitDispute(data)
if (response.type) {
Message.success('提交成功！')
+ navigate(`/mediate/visit/visitWorkBench`, { replace: true })
setCurrent(2)
}
}
--
Gitblit v1.8.0