From 522737d66480d2f42b8e83c2ddde0efa3b740f38 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期六, 06 九月 2025 10:47:05 +0800
Subject: [PATCH] 修复审批的问题
---
vite.config.ts | 9 +++++++--
src/views/approveManage/tradeApproval/approve.vue | 10 ++++++++++
src/router/modules/approvalManage.ts | 2 +-
src/views/approveManage/tradeApproval/list.vue | 5 +++--
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/router/modules/approvalManage.ts b/src/router/modules/approvalManage.ts
index 752b697..62f3110 100644
--- a/src/router/modules/approvalManage.ts
+++ b/src/router/modules/approvalManage.ts
@@ -30,7 +30,7 @@
},
},
{
- path: 'authorization/:id',
+ path: 'authorization/:id/:taskId',
name: 'tradeAuthorization',
component: () => import('@/views/approveManage/tradeApproval/approve.vue'),
meta: {
diff --git a/src/views/approveManage/tradeApproval/approve.vue b/src/views/approveManage/tradeApproval/approve.vue
index 87f98ee..d79abd3 100644
--- a/src/views/approveManage/tradeApproval/approve.vue
+++ b/src/views/approveManage/tradeApproval/approve.vue
@@ -312,6 +312,10 @@
return [...detail.items, summaryRow]
})
+const taskId = computed(() => {
+ return String(route.params.taskId || '')
+})
+
// 鐘舵�佹槧灏勶紙鍚庣涓枃 -> 鍓嶇鏋氫妇锛�
const statusServerToUi: Record<string, string> = {
'寰呬笂浼犳枃浠�': 'WAIT_UPLOAD',
@@ -334,6 +338,7 @@
onMounted(async () => {
const orderId = String(route.params.id || '')
+ console.log(route.params.taskId)
if (!orderId) return
try {
@@ -485,6 +490,8 @@
})
const orderId = String(route.params.id || '')
+ console.log(String(route.params.taskId || ''))
+ const taskId1 = taskId.value
const userId = userStore.getUserId ? Number(userStore.getUserId) : undefined
const comments = approvalForm.comments.trim()
@@ -497,6 +504,7 @@
// 璋冪敤瀹℃壒閫氳繃API
const result = await approveOrder({
orderId: orderId,
+ taskId: taskId1,
approvalOpinion: comments,
approverId: userId,
approverName: userStore.getUserDetail || '绠＄悊鍛�',
@@ -568,6 +576,7 @@
const orderId = String(route.params.id || '')
const userId = userStore.getUserId ? Number(userStore.getUserId) : undefined
const comments = approvalForm.comments.trim()
+ const taskId1 = String(route.params.taskId || '')
if (!orderId || !userId) {
ElMessage.error('璁㈠崟ID鎴栫敤鎴稩D涓嶈兘涓虹┖')
@@ -580,6 +589,7 @@
orderId: orderId,
approvalOpinion: comments,
approverId: userId,
+ taskId: taskId1,
approverName: userStore.getUserDetail || '绠＄悊鍛�',
approvalType: isAgreementOrder.value ? '瀹℃壒' : '鎺堟潈',
approvalResult: '椹冲洖'
diff --git a/src/views/approveManage/tradeApproval/list.vue b/src/views/approveManage/tradeApproval/list.vue
index dda1fe7..42524c7 100644
--- a/src/views/approveManage/tradeApproval/list.vue
+++ b/src/views/approveManage/tradeApproval/list.vue
@@ -622,7 +622,8 @@
status: uiStatus,
statusName: order.orderStatus || '',
orderStatus: StatusMapper.toUIStatus(order.orderStatus), // 杞崲涓烘爣鍑嗙姸鎬佹灇涓�
- workFlowId: order.workflowId || ''
+ workFlowId: order.workflowId || '',
+ taskId: order.taskId || ''
}
const subOrders: any[] = Array.isArray(order?.orderDetails)
@@ -725,7 +726,7 @@
// 鎺堟潈锛氳烦杞埌鎺堟潈椤甸潰
const toAuthorize = (row: any) => {
- router.push({ name: 'tradeAuthorization', params: { id: row.id } })
+ router.push({ name: 'tradeAuthorization', params: { id: row.id, taskId: row.taskId } })
}
onMounted(async ()=>{
diff --git a/vite.config.ts b/vite.config.ts
index 7bdfd99..921cb0b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -22,14 +22,19 @@
changeOrigin: true,
// rewrite: (path) => path.replace(/^\/api/, '/'),
},
+ '/api1': {
+ target: 'http://36.133.126.111:7099',
+ changeOrigin: true,
+ rewrite: (path) => path.replace(/^\/api1/, '/api'),
+ },
'/api': {
// target: 'http://192.168.0.38:8088', // 鏉�
// target: 'http://10.88.211.191:8088', // 鏉�
// target:'http://10.209.233.16/admin',//淇″垱姝ｅ紡
// target: 'http://36.133.126.111:7099/api', //娴嬭瘯
// target: 'https://zynlpt.ccccltd.cn/admin', // 姝ｅ紡 (瑕佹墦寮�changeOrigin鍜宺ewrite)
- // target: 'http://localhost:8080',
- target: 'http://36.133.126.111:7099/trade-api',
+ target: 'http://localhost:8089',
+ // target: 'http://36.133.126.111:7099/trade-api',
changeOrigin: true, // 鍏佽璺ㄥ煙
rewrite: (path) => path.replace(/^\/api/, '/'), //杩炴祴璇曠幆澧冭娉ㄩ噴杩欒锛岃繛鍚庣涓汉鍒欐墦寮�
},
--
Gitblit v1.8.0