From 05b85ad6db31b9e28a59f0563aea05949c7c7b3a Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 15:54:39 +0800
Subject: [PATCH] 提交源码
---
src/views/approveManage/tradeApproval/approve.vue | 21 +++++++++++++++++++++
src/views/approveManage/tradeApproval/list.vue | 16 ++--------------
src/router/index.ts | 2 +-
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index cd9b7b9..d5c6977 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -45,7 +45,7 @@
const localUserInfo = localStorage.getItem('userInfo')
if (localUserInfo) {
const userInfo = JSON.parse(localUserInfo)
- if (userInfo.adminToken) {
+ if (userInfo.adminToken && userInfo.adminToken !== '') {
const obj: any = {
adminToken: userInfo.adminToken,
screenToken: '',
diff --git a/src/views/approveManage/tradeApproval/approve.vue b/src/views/approveManage/tradeApproval/approve.vue
index 10e67a7..9c1494c 100644
--- a/src/views/approveManage/tradeApproval/approve.vue
+++ b/src/views/approveManage/tradeApproval/approve.vue
@@ -269,6 +269,7 @@
import { approveOrder } from '@/api/approvalManage'
import { useUserInfo } from '@/stores/modules/userInfo'
import createAxios from '@/utils/axios'
+import productApi from '@/api/productApi'
const route = useRoute()
const router = useRouter()
@@ -350,6 +351,26 @@
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) {
+ // 蹇界暐浜у搧璇︽儏澶辫触锛屼笉闃诲璁㈠崟璇︽儏
+ }
+
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+
// 鏄犲皠璁㈠崟璇︽儏澶撮儴淇℃伅
const head = {
orderNo: data.orderId,
diff --git a/src/views/approveManage/tradeApproval/list.vue b/src/views/approveManage/tradeApproval/list.vue
index cd0dba7..af22a7e 100644
--- a/src/views/approveManage/tradeApproval/list.vue
+++ b/src/views/approveManage/tradeApproval/list.vue
@@ -546,17 +546,6 @@
const list: any[] = Array.isArray(pageData?.list) ? pageData.list : []
page.total = Number(pageData?.total || 0)
- // 骞跺彂鑾峰彇姣忎釜璁㈠崟鐨勮鎯咃紙鐢ㄤ簬鏋勯�犲瓙璁㈠崟琛岋級
- const detailsArr = await Promise.all(
- list.map(async (order: any) => {
- try {
- const detailRes = (await orderApi.getOrderDetail(order.orderId)) as any
- return detailRes?.data
- } catch (e) {
- return null
- }
- })
- )
const flatData: any[] = []
list.forEach((order: any, idx: number) => {
@@ -574,9 +563,8 @@
workFlowId: order.workflowId || ''
}
- const detail = detailsArr[idx]
- const subOrders: any[] = Array.isArray(detail?.orderDetails)
- ? detail.orderDetails.map((d: any, i: number) => ({
+ const subOrders: any[] = Array.isArray(order?.orderDetails)
+ ? order?.orderDetails.map((d: any, i: number) => ({
id: `${order.orderId}-${i + 1}`,
isMainOrder: false,
productName: order.productName || '',
--
Gitblit v1.8.0