From b3fedd4221b807a07058be9d5d5d8ba8998adbcb Mon Sep 17 00:00:00 2001 From: Bang Hu <hu_bang@hotmail.com> Date: 星期四, 11 九月 2025 21:35:31 +0800 Subject: [PATCH] Bug修改代码提交 --- src/views/tradeManage/detail/index.vue | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 3 deletions(-) diff --git a/src/views/tradeManage/detail/index.vue b/src/views/tradeManage/detail/index.vue index 0189854..c5eb9b5 100644 --- a/src/views/tradeManage/detail/index.vue +++ b/src/views/tradeManage/detail/index.vue @@ -68,10 +68,16 @@ </el-descriptions-item> <el-descriptions-item label="鎻愪緵鑰�">{{ detail.supplier }}</el-descriptions-item> <el-descriptions-item label="琛屼笟棰嗗煙">{{ detail.industry }}</el-descriptions-item> - <el-descriptions-item label="鍗曚綅宸ョ▼">{{ detail.projectUnit }}</el-descriptions-item> + <el-descriptions-item label="鍗曚綅宸ョ▼"> + <el-tooltip effect="dark" :content="detail.projectUnit || '-'" placement="top" :disabled="!(detail.projectUnit && String(detail.projectUnit).trim())" popper-class="tooltip-wrap"> + <div class="ellipsis-1">{{ detail.projectUnit || '-' }}</div> + </el-tooltip> + </el-descriptions-item> <el-descriptions-item label="浜у搧绫诲瀷">{{ detail.productType || '-' }}</el-descriptions-item> <el-descriptions-item label="浜у搧绠�浠�"> - <div class="desc-wrap">{{ detail.productDesc }}</div> + <el-tooltip effect="dark" :content="detail.productDesc || '-'" placement="top" :disabled="!(detail.productDesc && String(detail.productDesc).trim())" popper-class="tooltip-wrap" trigger="click"> + <div class="desc-wrap ellipsis-3">{{ detail.productDesc || '-' }}</div> + </el-tooltip> </el-descriptions-item> </el-descriptions> @@ -287,6 +293,53 @@ </div> </el-card> + + <!-- 浜ゆ槗璇勪环锛堝綋宸茶瘎浠锋椂鏄剧ず锛� --> + <el-card class="mt15" shadow="never" v-if="showEvaluation"> + <div class="title">浜ゆ槗璇勪环</div> + <div class="evaluation-content"> + <div class="evaluation-form"> + <div class="rating-section"> + <div class="rating-items"> + <div class="rating-row"> + <div class="rating-item"> + <label class="required">缁煎悎璇勫垎:</label> + <el-rate :model-value="evaluation.overallRating" :max="5" disabled :colors="['#99A9BF', '#F7BA2A', '#FF9900']" /> + </div> + <div class="rating-item"> + <label class="required">鏈嶅姟璇勫垎:</label> + <el-rate :model-value="evaluation.serviceRating" :max="5" disabled :colors="['#99A9BF', '#F7BA2A', '#FF9900']" /> + </div> + </div> + <div class="rating-row"> + <div class="rating-item"> + <label class="required">璐ㄩ噺璇勫垎:</label> + <el-rate :model-value="evaluation.qualityRating" :max="5" disabled :colors="['#99A9BF', '#F7BA2A', '#FF9900']" /> + </div> + <div class="rating-item"> + <label class="required">閫熷害璇勫垎:</label> + <el-rate :model-value="evaluation.speedRating" :max="5" disabled :colors="['#99A9BF', '#F7BA2A', '#FF9900']" /> + </div> + </div> + </div> + </div> + + <div class="form-item"> + <label class="required">璇勪环鍐呭:</label> + <div class="eval-text">{{ evaluation.content || '-' }}</div> + </div> + + <div class="form-item"> + <label>鍏朵粬淇℃伅:</label> + <div class="eval-meta"> + <span>鏄惁鍖垮悕锛歿{ evaluation.isAnonymous ? '鏄�' : '鍚�' }}</span> + <span class="split">|</span> + <span>璇勪环鏃堕棿锛歿{ evaluation.evaluateTime || '-' }}</span> + </div> + </div> + </div> + </div> + </el-card> <!-- 杩斿洖鎸夐挳 --> <div class="action-buttons"> <el-button @click="goBack">杩斿洖</el-button> @@ -309,6 +362,15 @@ const route = useRoute() const router = useRouter() const detail = reactive<any>({ items: [], records: [], nodes: [] }) +const evaluation = reactive<any>({ + content: '', + overallRating: 0, + serviceRating: 0, + qualityRating: 0, + speedRating: 0, + isAnonymous: false, + evaluateTime: '' +}) const orderTableWrapRef = ref<HTMLElement | null>(null) const activeTab = ref('records') const userStore = useUserInfo() @@ -334,6 +396,11 @@ const statusOrder = ['WAIT_UPLOAD', 'WAIT_AUTHORIZE', 'WAIT_CONFIRM', 'COMPLETED', 'EVALUATED'] const currentStatus = statusServerToUi[statusName] return currentStatus && statusOrder.indexOf(currentStatus) >= statusOrder.indexOf('WAIT_CONFIRM') +}) + +// 鏄惁鏄剧ず璇勪环鍗$墖锛堝凡璇勪环鏃舵樉绀猴級 +const showEvaluation = computed(() => { + return (detail.isEvaluate === '宸茶瘎浠�') }) // 璁$畻琛ㄦ牸鏁版嵁锛屾坊鍔犳眹鎬昏 @@ -446,6 +513,7 @@ projectUnit: data.projectUnit || '-', productType: data.productType || '-', productDesc: data.productDesc || '-', + isEvaluate: data.isEvaluate || '鏈瘎浠�' } // 鏄庣粏椤规槧灏� @@ -481,6 +549,18 @@ nodes: [], workflowId: data.workflowId || data.processinstId || '' }) + + // 鏄犲皠浜ゆ槗璇勪环淇℃伅锛堝鏋滃瓨鍦級 + if (data.evaluation) { + evaluation.content = data.evaluation.content || '' + evaluation.overallRating = Number(data.evaluation.rating || data.evaluation.overallRating || 0) + evaluation.serviceRating = Number(data.evaluation.serviceRating || 0) + evaluation.qualityRating = Number(data.evaluation.qualityRating || 0) + // 鍚庣涓� deliveryRating锛屽榻愬墠绔� speedRating 鍛藉悕 + evaluation.speedRating = Number(data.evaluation.deliveryRating || data.evaluation.speedRating || 0) + evaluation.isAnonymous = Boolean(data.evaluation.isAnonymous) + evaluation.evaluateTime = formatDateTime((data.evaluation.replyTime || data.evaluation.createdAt || data.evaluation.createTime) as any) + } // 鍒濆鍖栦氦鏄撲俊鎭娉ㄦ暟鎹� remarkItems.value = (detail.items || []).map((item: any, index: number) => { @@ -693,7 +773,8 @@ // 妫�鏌ュ搷搴旀牸寮� 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) + // previewUrl = responseData.data console.log('浣跨敤棰勮URL:', previewUrl) } else { console.log('棰勮URL鑾峰彇澶辫触锛屼娇鐢ㄤ笅杞芥柟寮�') @@ -1010,6 +1091,25 @@ line-height: 22px; } +/* 鍗曡鐪佺暐锛堢敤浜庘�滃崟浣嶅伐绋嬧�濓級 */ +.ellipsis-1 { + max-height: 22px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +/* 澶氳鐪佺暐锛堢敤浜庘�滀骇鍝佺畝浠嬧�濓紝鍥哄畾涓�3琛岋紝鍙寜闇�璋冩暣锛� */ +.ellipsis-3 { + display: -webkit-box; + line-clamp: 3; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; +} + + + /* 瀹℃壒杩借釜鏍囩椤垫牱寮� */ .approval-tabs { margin-top: 15px; -- Gitblit v1.8.0