From 751dfe21d19a22bb130a6a14857470868d7be53a Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 18:04:51 +0800
Subject: [PATCH] 修复预览，提交审核获取不到用户的问题
---
src/views/approveManage/tradeApproval/approve.vue | 106 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 37 deletions(-)
diff --git a/src/views/approveManage/tradeApproval/approve.vue b/src/views/approveManage/tradeApproval/approve.vue
index c9da9b0..461641e 100644
--- a/src/views/approveManage/tradeApproval/approve.vue
+++ b/src/views/approveManage/tradeApproval/approve.vue
@@ -272,6 +272,7 @@
import productApi from '@/api/productApi'
import sysUserService from "@/api/sysUser";
import workFlowApi from "@/api/workFlowApi";
+import {queryUserDetail} from "@/api/userInfo";
const route = useRoute()
const router = useRouter()
@@ -312,6 +313,10 @@
return [...detail.items, summaryRow]
})
+const taskId = computed(() => {
+ return String(route.params.taskId || '')
+})
+
// 鐘舵�佹槧灏勶紙鍚庣涓枃 -> 鍓嶇鏋氫妇锛�
const statusServerToUi: Record<string, string> = {
'寰呬笂浼犳枃浠�': 'WAIT_UPLOAD',
@@ -334,8 +339,26 @@
onMounted(async () => {
const orderId = String(route.params.id || '')
+ console.log(route.params.taskId)
if (!orderId) return
-
+
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ if (!userStore.getUserId) {
+ try {
+ const res: any = await queryUserDetail()
+ if (res?.code === 200 && res.data) {
+ userStore.updateUserDetail(res.data)
+ } else {
+ ElMessage.error(res?.msg || '鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛岃鍏堢櫥褰�')
+ return
+ }
+ } catch (e) {
+ console.error('鑾峰彇鐢ㄦ埛璇︽儏澶辫触:', e)
+ ElMessage.error('鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛岃绋嶅悗閲嶈瘯')
+ return
+ }
+ }
+
try {
// 骞惰鑾峰彇璁㈠崟璇︽儏鍜屽崗璁被鍨嬫鏌�
const [orderRes, agreementRes] = await Promise.all([
@@ -485,6 +508,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,41 +522,46 @@
// 璋冪敤瀹℃壒閫氳繃API
const result = await approveOrder({
orderId: orderId,
+ taskId: taskId1,
approvalOpinion: comments,
approverId: userId,
approverName: userStore.getUserDetail || '绠＄悊鍛�',
approvalType: isAgreementOrder.value ? '瀹℃壒' : '鎺堟潈',
- approvalResult: '閫氳繃'
+ approvalResult: '閫氳繃',
+ orderDetails: form.items.map((item: any) => ({
+ id: item.id,
+ remarks: item.remark || '' // 浣跨敤琛ㄥ崟涓殑澶囨敞
+ }))
})
if (result && result.code === 200) {
// 鏇存柊浜ゆ槗淇℃伅澶囨敞锛堝彧鏇存柊remarks锛屼笉鏇存柊璁㈠崟鐘舵�侊級
- const updateData = {
- orderId: orderId,
- orderDetails: form.items.map((item: any) => ({
- id: item.id,
- remarks: item.remark || '' // 浣跨敤琛ㄥ崟涓殑澶囨敞
- }))
- }
-
- await orderApi.updateOrderDetailRemarksOnly(updateData)
-
- // 瀹℃壒閫氳繃鍚庯紝浣跨敤鏂扮殑API鎺ュ彛鏇存柊璁㈠崟鐘舵�佸埌涓嬩竴涓姸鎬�
- await orderApi.updateOrderStatusToNext(orderId)
+ // const updateData = {
+ // orderId: orderId,
+ // orderDetails: form.items.map((item: any) => ({
+ // id: item.id,
+ // remarks: item.remark || '' // 浣跨敤琛ㄥ崟涓殑澶囨敞
+ // }))
+ // }
+ //
+ // await orderApi.updateOrderDetailRemarksOnly(updateData)
+ //
+ // // 瀹℃壒閫氳繃鍚庯紝浣跨敤鏂扮殑API鎺ュ彛鏇存柊璁㈠崟鐘舵�佸埌涓嬩竴涓姸鎬�
+ // await orderApi.updateOrderStatusToNext(orderId)
ElMessage.success('瀹℃壒閫氳繃鎴愬姛')
- if(!detail.workflowId.value){
- ElMessage.error("宸ヤ綔娴乮d涓虹┖涓嶈兘杩涜宸ヤ綔娴佷换鍔℃彁浜�")
- return
- }
- // 璋冪敤宸ヤ綔娴�
- const wfRes: any = await workFlowApi.completeWorkflow({
- taskId: String(detail.workflowId.value),
- userid: userStore.getUserId,
- commponet: '瀹℃牳閫氳繃'
- })
- if (wfRes?.code === 200 && wfRes.data?.processinstId) {
- console.log('宸ヤ綔娴佹彁浜ゆ垚鍔�')
- }
+ // if(!detail.workflowId.value){
+ // ElMessage.error("宸ヤ綔娴乮d涓虹┖涓嶈兘杩涜宸ヤ綔娴佷换鍔℃彁浜�")
+ // return
+ // }
+ // // 璋冪敤宸ヤ綔娴�
+ // const wfRes: any = await workFlowApi.completeWorkflow({
+ // taskId: String(detail.workflowId.value),
+ // userid: userStore.getUserId,
+ // commponet: '瀹℃牳閫氳繃'
+ // })
+ // if (wfRes?.code === 200 && wfRes.data?.processinstId) {
+ // console.log('宸ヤ綔娴佹彁浜ゆ垚鍔�')
+ // }
router.back()
} else {
ElMessage.error(result?.msg || '瀹℃壒閫氳繃澶辫触')
@@ -564,6 +594,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涓嶈兘涓虹┖')
@@ -576,6 +607,7 @@
orderId: orderId,
approvalOpinion: comments,
approverId: userId,
+ taskId: taskId1,
approverName: userStore.getUserDetail || '绠＄悊鍛�',
approvalType: isAgreementOrder.value ? '瀹℃壒' : '鎺堟潈',
approvalResult: '椹冲洖'
@@ -583,17 +615,17 @@
if (result && result.code === 200) {
// 椹冲洖璁㈠崟锛屾洿鏂拌鍗曠姸鎬佸埌涓婁竴涓姸鎬�
- await orderApi.updateOrderStatusToPrevious(orderId)
+ // await orderApi.updateOrderStatusToPrevious(orderId)
ElMessage.success('椹冲洖鎴愬姛')
// 璋冪敤宸ヤ綔娴�
- const wfRes: any = await workFlowApi.rejectStartNodeWorkflow({
- taskId: String(detail.workflowId.value),
- userid: userStore.getUserId,
- commponet: '椹冲洖'
- })
- if (wfRes?.code === 200 && wfRes.data?.processinstId) {
- console.log('宸ヤ綔娴侀┏鍥炴垚鍔�')
- }
+ // const wfRes: any = await workFlowApi.rejectStartNodeWorkflow({
+ // taskId: String(detail.workflowId.value),
+ // userid: userStore.getUserId,
+ // commponet: '椹冲洖'
+ // })
+ // if (wfRes?.code === 200 && wfRes.data?.processinstId) {
+ // console.log('宸ヤ綔娴侀┏鍥炴垚鍔�')
+ // }
router.back()
} else {
ElMessage.error(result?.msg || '椹冲洖澶辫触')
@@ -758,7 +790,7 @@
// 妫�鏌ュ搷搴旀牸寮�
const responseData = previewResponse as any
if (responseData && responseData.code === 200 && responseData.data) {
- previewUrl = responseData.data
+ previewUrl = responseData.data.replaceAll('http://192.168.20.52:9000',import.meta.env.VITE_FILE_PREVIEW_URL)
console.log('浣跨敤棰勮URL:', previewUrl)
} else {
console.log('棰勮URL鑾峰彇澶辫触锛屼娇鐢ㄤ笅杞芥柟寮�')
--
Gitblit v1.8.0