From 26b2a4b21b3c2cd34e6781cf7876eae580a7e1ec Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 23 五月 2026 15:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro_鹤壁' into dev_NEW_pro_鹤壁
---
src/pages/qualityManagement/materialInspection/index.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/pages/qualityManagement/materialInspection/index.vue b/src/pages/qualityManagement/materialInspection/index.vue
index eb4a140..571e68f 100644
--- a/src/pages/qualityManagement/materialInspection/index.vue
+++ b/src/pages/qualityManagement/materialInspection/index.vue
@@ -76,11 +76,11 @@
</view>
</view>
<view class="status-tags">
- <u-tag v-if="item.checkResult"
- :type="getTagType(item.checkResult)"
+ <u-tag v-if="item.passRate != null && item.passRate !== ''"
+ type="primary"
size="mini"
class="status-tag">
- {{ item.checkResult }}
+ 鍚堟牸鐜� {{ formatPassRate(item.passRate) }}
</u-tag>
<u-tag :type="getStateTagType(item.inspectState)"
size="mini"
@@ -316,11 +316,13 @@
return inspectState ? "checkmark-circle" : "time";
};
- // 鑾峰彇鏍囩绫诲瀷
- const getTagType = checkResult => {
- if (checkResult === "鍚堟牸") return "success";
- if (checkResult === "涓嶅悎鏍�") return "error";
- return "default";
+ // 鏍煎紡鍖栧悎鏍肩巼
+ const formatPassRate = rate => {
+ if (rate === null || rate === undefined || rate === "") return "-";
+ const num = Number(rate);
+ if (isNaN(num)) return rate;
+ if (num <= 1) return `${(num * 100).toFixed(2)}%`;
+ return `${num}%`;
};
// 鑾峰彇鐘舵�佹爣绛剧被鍨�
@@ -383,9 +385,11 @@
pendingCount.value = inspectionList.value.filter(
item => !item.inspectState
).length;
- qualifiedCount.value = inspectionList.value.filter(
- item => item.checkResult === "鍚堟牸"
- ).length;
+ qualifiedCount.value = inspectionList.value.filter(item => {
+ const rate = Number(item.passRate);
+ if (isNaN(rate)) return false;
+ return rate <= 1 ? rate >= 1 : rate >= 100;
+ }).length;
})
.catch(err => {
tableLoading.value = false;
--
Gitblit v1.9.3