From bd125eecd57d2f4e559c6170d20157591300fe3d Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 04 九月 2025 20:57:44 +0800
Subject: [PATCH] 修改购物车等BUG
---
src/views/approveManage/tradeApproval/approve.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/views/approveManage/tradeApproval/approve.vue b/src/views/approveManage/tradeApproval/approve.vue
index 10e67a7..c9da9b0 100644
--- a/src/views/approveManage/tradeApproval/approve.vue
+++ b/src/views/approveManage/tradeApproval/approve.vue
@@ -269,6 +269,9 @@
import { approveOrder } from '@/api/approvalManage'
import { useUserInfo } from '@/stores/modules/userInfo'
import createAxios from '@/utils/axios'
+import productApi from '@/api/productApi'
+import sysUserService from "@/api/sysUser";
+import workFlowApi from "@/api/workFlowApi";
const route = useRoute()
const router = useRouter()
@@ -350,6 +353,40 @@
const statusName: string = data.orderStatus || ''
const uiStatus = statusServerToUi[statusName] || 'INFO'
+ // 鏍规嵁浜у搧id鑾峰彇浜у搧淇℃伅锛屾洿鏂板ご閮ㄥ睍绀�
+ try {
+ if (data.productId) {
+ const detailRes: any = await productApi.getProductById({ id: data.productId })
+ if (detailRes?.code === 200 && detailRes.data) {
+ // 鐢ㄤ骇鍝佽鎯呰ˉ鍏ㄥご淇℃伅
+ data.productName = detailRes.data.name || data.productName
+ data.providerName = detailRes.data.submissionUnit || data.providerName
+ data.industry = detailRes.data.industrialChainName || data.industry
+ data.productDesc = detailRes.data.describe || data.productDesc
+ data.projectUnit = detailRes.data.importantAreaName || data.productDesc
+ data.productType = detailRes.data.typeName || data.productDesc
+ }
+ }
+ } catch (e) {
+ // 蹇界暐浜у搧璇︽儏澶辫触锛屼笉闃诲璁㈠崟璇︽儏
+ }
+
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ try {
+ const userRes: any = await sysUserService.getUserdetail({ userId: data.userId })
+ if (userRes?.code === 200 && userRes.data) {
+ // 鐢ㄤ骇鍝佽鎯呰ˉ鍏ㄥご淇℃伅
+ data.unitName = userRes.data.unitName || data.unitName
+ data.userName = userRes.data.name || data.userName
+ data.userDept = userRes.data.departmentName || data.userDept
+ data.userPhone = userRes.data.phone || data.userPhone
+ data.userAccount = userRes.data.username || data.userAccount
+ }
+ }catch (e){
+
+ }
+
// 鏄犲皠璁㈠崟璇︽儏澶撮儴淇℃伅
const head = {
orderNo: data.orderId,
@@ -399,6 +436,7 @@
items,
pointTotal: pointTotalNum.toLocaleString(),
cashTotal: cashTotalNum.toLocaleString(),
+ workflowId: data.workflowId || data.processinstId || ''
})
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -481,6 +519,19 @@
// 瀹℃壒閫氳繃鍚庯紝浣跨敤鏂扮殑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('宸ヤ綔娴佹彁浜ゆ垚鍔�')
+ }
router.back()
} else {
ElMessage.error(result?.msg || '瀹℃壒閫氳繃澶辫触')
@@ -534,6 +585,15 @@
// 椹冲洖璁㈠崟锛屾洿鏂拌鍗曠姸鎬佸埌涓婁竴涓姸鎬�
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('宸ヤ綔娴侀┏鍥炴垚鍔�')
+ }
router.back()
} else {
ElMessage.error(result?.msg || '椹冲洖澶辫触')
--
Gitblit v1.8.0