From 80ca024e9ae633df0dc9f4e8f533f33b526afb3d Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 16:24:38 +0800
Subject: [PATCH] 修复文件上传获取不到用户信息的BUG
---
vite.config.ts | 4
src/views/tradeManage/upload/index.vue | 55 ++++++++++++++++++
src/views/pointsManage/ruleDetail/index.vue | 43 ++++++++++++-
src/views/pointsManage/settings/index.vue | 42 ++++++++++++-
src/views/productManage/productPriceViewer/index.vue | 4
src/views/pointsManage/personal/index.vue | 2
src/views/tradeManage/confirm/index.vue | 21 ++++++
7 files changed, 155 insertions(+), 16 deletions(-)
diff --git a/src/views/pointsManage/personal/index.vue b/src/views/pointsManage/personal/index.vue
index 6d0bfd5..caf6695 100644
--- a/src/views/pointsManage/personal/index.vue
+++ b/src/views/pointsManage/personal/index.vue
@@ -104,7 +104,7 @@
<!-- 娴佹按琛ㄦ牸 -->
<div class="table-section">
<el-table :data="flowList" stripe style="width: 100%" :height="440">
- <el-table-column prop="id" label="搴忓彿" width="80" align="center" />
+ <el-table-column type="index" label="搴忓彿" width="80" align="center" />
<el-table-column prop="dataCategory" label="鏁版嵁绫荤洰" width="120">
<template #default="{ row }">
<span>{{ getCategoryLabel(row.dataCategory) }}</span>
diff --git a/src/views/pointsManage/ruleDetail/index.vue b/src/views/pointsManage/ruleDetail/index.vue
index 1f5feca..1955679 100644
--- a/src/views/pointsManage/ruleDetail/index.vue
+++ b/src/views/pointsManage/ruleDetail/index.vue
@@ -20,7 +20,7 @@
<el-input
v-model="pointRuleDetial.pointsValue"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
readonly
/>
@@ -29,7 +29,7 @@
<el-input
v-model="pointRuleDetial.dailyLimit"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
readonly
v-if="pointRuleDetial.isLimit === 1"
@@ -62,7 +62,7 @@
<el-input
v-model="pointRuleDetials.pointsValue"
size="small"
- style="width: 60px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
readonly
/>
@@ -71,7 +71,7 @@
<el-input
v-model="pointRuleDetials.dailyLimit"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
readonly
v-if="pointRuleDetials.isLimit === 1"
@@ -155,9 +155,42 @@
const res = await pointsApi.getPointsRuleById(formData)
if (res.code === 200 && res.data) {
+ res.data.getPointsRuleList.map(item => {
+ item.pointsRules.map(iitem => {
+ if(iitem.ruleDescription.indexOf('琚�') > -1){
+ iitem.descSort = 0
+ }else{
+ iitem.descSort = 1
+ }
+ return iitem
+ })
+ item.pointsRules.sort((a,b) => {
+ if(a.ruleName === b.ruleName){
+ return a.descSort - b.descSort
+ }else {
+ return a.ruleName.localeCompare(b.ruleName)
+ }
+ })
+ })
+ res.data.consumePointsRuleList.map(item => {
+ item.pointsRules.map(iitem => {
+ if(iitem.ruleDescription.indexOf('琚�') > -1){
+ iitem.descSort = 0
+ }else{
+ iitem.descSort = 1
+ }
+ return iitem
+ })
+ item.pointsRules.sort((a,b) => {
+ if(a.ruleName === b.ruleName){
+ return a.descSort - b.descSort
+ }else {
+ return a.ruleName.localeCompare(b.ruleName)
+ }
+ })
+ })
// 灏嗗悗绔暟鎹槧灏勫埌鍓嶇瑙勫垯瀵硅薄
Object.assign(rules.value, res.data)
- console.log(rules.value)
}
} else {
// 濡傛灉娌℃湁ruleId鍙傛暟锛屽垯鑾峰彇鎵�鏈夎鍒�
diff --git a/src/views/pointsManage/settings/index.vue b/src/views/pointsManage/settings/index.vue
index c2aa98b..89bcb29 100644
--- a/src/views/pointsManage/settings/index.vue
+++ b/src/views/pointsManage/settings/index.vue
@@ -22,7 +22,7 @@
<el-input
v-model="pointRuleDetial.pointsValue"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
/>
<span class="unit">绉垎</span>
@@ -30,7 +30,7 @@
<el-input
v-model="pointRuleDetial.dailyLimit"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
v-if="pointRuleDetial.isLimit === 1"
/>
@@ -129,7 +129,7 @@
<el-input
v-model="pointRuleDetials.pointsValue"
size="small"
- style="width: 60px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
/>
<span class="unit">绉垎</span>
@@ -137,7 +137,7 @@
<el-input
v-model="pointRuleDetials.dailyLimit"
size="small"
- style="width: 80px;"
+ style="width: 50px;"
placeholder="璇疯緭鍏�"
v-if="pointRuleDetials.isLimit === 1"
/>
@@ -349,6 +349,40 @@
const res = await pointsApi.getPointsRuleById(formData)
if (res.code === 200 && res.data) {
+ res.data.getPointsRuleList.map(item => {
+ item.pointsRules.map(iitem => {
+ if(iitem.ruleDescription.indexOf('琚�') > -1){
+ iitem.descSort = 0
+ }else{
+ iitem.descSort = 1
+ }
+ return iitem
+ })
+ item.pointsRules.sort((a,b) => {
+ if(a.ruleName === b.ruleName){
+ return a.descSort - b.descSort
+ }else {
+ return a.ruleName.localeCompare(b.ruleName)
+ }
+ })
+ })
+ res.data.consumePointsRuleList.map(item => {
+ item.pointsRules.map(iitem => {
+ if(iitem.ruleDescription.indexOf('琚�') > -1){
+ iitem.descSort = 0
+ }else{
+ iitem.descSort = 1
+ }
+ return iitem
+ })
+ item.pointsRules.sort((a,b) => {
+ if(a.ruleName === b.ruleName){
+ return a.descSort - b.descSort
+ }else {
+ return a.ruleName.localeCompare(b.ruleName)
+ }
+ })
+ })
// 灏嗗悗绔暟鎹槧灏勫埌鍓嶇瑙勫垯瀵硅薄
Object.assign(rules.value, res.data)
console.log(rules.value)
diff --git a/src/views/productManage/productPriceViewer/index.vue b/src/views/productManage/productPriceViewer/index.vue
index 0a7690d..2d9b05c 100644
--- a/src/views/productManage/productPriceViewer/index.vue
+++ b/src/views/productManage/productPriceViewer/index.vue
@@ -321,7 +321,7 @@
<td class="value">{{ statusText(orderStatus.status) }}</td>
<td></td>
<td class="value link">
- <el-link type="primary" @click="viewOrder">鏌ョ湅璁㈠崟淇℃伅</el-link>
+<!-- <el-link type="primary" @click="viewOrder">鏌ョ湅璁㈠崟淇℃伅</el-link>-->
</td>
</tr>
</tbody>
@@ -801,7 +801,7 @@
// 鑾峰彇宸ヤ綔娴佸弬鏁�
const wkParamsRes: any = await workFlowApi.getWorkFlowParams({
type: type,
- unitId: '1',
+ // unitId: '1',
businessKey: type
})
if(wkParamsRes?.code === 200 && wkParamsRes.data?.processTemplateId){
diff --git a/src/views/tradeManage/confirm/index.vue b/src/views/tradeManage/confirm/index.vue
index 0392ee4..d893c4b 100644
--- a/src/views/tradeManage/confirm/index.vue
+++ b/src/views/tradeManage/confirm/index.vue
@@ -242,6 +242,7 @@
import createAxios from '@/utils/axios'
import productApi from '@/api/productApi'
import sysUserService from '@/api/sysUser'
+import {queryUserDetail} from "@/api/userInfo";
const route = useRoute()
const router = useRouter()
@@ -294,7 +295,24 @@
onMounted(async () => {
const orderId = String(route.params.id || '')
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 res = (await orderApi.getOrderDetail(orderId)) as any
const data = res?.data || {}
@@ -432,6 +450,7 @@
try {
const orderId = String(route.params.id || '')
const userId = userStore.getUserId ? Number(userStore.getUserId) : undefined
+ console.log(userId)
if (!orderId || !userId) {
ElMessage.error('璁㈠崟ID鎴栫敤鎴稩D涓嶈兘涓虹┖')
diff --git a/src/views/tradeManage/upload/index.vue b/src/views/tradeManage/upload/index.vue
index fd644c8..3f34ba1 100644
--- a/src/views/tradeManage/upload/index.vue
+++ b/src/views/tradeManage/upload/index.vue
@@ -255,6 +255,9 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { useUserInfo } from '@/stores/modules/userInfo'
import createAxios from '@/utils/axios'
+import productApi from "@/api/productApi";
+import sysUserService from "@/api/sysUser";
+import {queryUserDetail} from "@/api/userInfo";
const route = useRoute()
const router = useRouter()
@@ -310,12 +313,62 @@
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 res = (await orderApi.getOrderDetail(orderId)) as any
const data = res?.data || {}
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 = {
@@ -756,7 +809,7 @@
// 妫�鏌ュ搷搴旀牸寮�
const responseData = previewResponse as any
if (responseData && responseData.code === 200 && responseData.data) {
- previewUrl = responseData.data
+ // previewUrl = responseData.data.replaceAll("192.168.20.52", import.meta.env.)
console.log('浣跨敤棰勮URL:', previewUrl)
} else {
console.log('棰勮URL鑾峰彇澶辫触锛屼娇鐢ㄤ笅杞芥柟寮�')
diff --git a/vite.config.ts b/vite.config.ts
index 921cb0b..399f173 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -33,8 +33,8 @@
// 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:8089',
- // 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