From 805b087e4d036c51e0b377b7264a99d37fb15ff0 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 16 五月 2026 10:58:28 +0800
Subject: [PATCH] 更新质量管理模块，新增合格数量和不合格数量字段，修改数量标签为总数量，计算合格率展示
---
src/pages/qualityManagement/materialInspection/detail.vue | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/pages/qualityManagement/materialInspection/detail.vue b/src/pages/qualityManagement/materialInspection/detail.vue
index e45b9c0..6b3bfe8 100644
--- a/src/pages/qualityManagement/materialInspection/detail.vue
+++ b/src/pages/qualityManagement/materialInspection/detail.vue
@@ -15,10 +15,10 @@
</view>
<text class="header-title">{{ detailData.productName || '-' }}</text>
<view class="status-tags">
- <u-tag :type="getTagType(detailData.checkResult)"
+ <u-tag :type="getPassRateTagType(detailData.passRate)"
size="small"
class="status-tag">
- {{ detailData.checkResult || '-' }}
+ 鍚堟牸鐜� {{ formatPassRate(detailData.passRate) }}
</u-tag>
<u-tag :type="getStateTagType(detailData.inspectState)"
size="small"
@@ -58,8 +58,20 @@
<text class="detail-value">{{ detailData.unit || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">鏁伴噺</text>
- <text class="detail-value">{{ detailData.quantity || 0 }}</text>
+ <text class="detail-label">鎬绘暟閲�</text>
+ <text class="detail-value">{{ detailData.quantity ?? '-' }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">鍚堟牸鏁伴噺</text>
+ <text class="detail-value">{{ detailData.qualifiedQuantity ?? '-' }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">涓嶅悎鏍兼暟閲�</text>
+ <text class="detail-value">{{ detailData.unqualifiedQuantity ?? '-' }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">鍚堟牸鐜�</text>
+ <text class="detail-value">{{ formatPassRate(detailData.passRate) }}</text>
</view>
<view class="detail-row">
<text class="detail-label">妫�娴嬪崟浣�</text>
@@ -160,16 +172,23 @@
return dayjs(date).format("YYYY-MM-DD");
};
- // 鑾峰彇鏍囩绫诲瀷
- const getTagType = result => {
- switch (result) {
- case "鍚堟牸":
- return "success";
- case "涓嶅悎鏍�":
- return "error";
- default:
- return "info";
- }
+ // 鏍煎紡鍖栧悎鏍肩巼锛堟敮鎸� 0鈥�1 灏忔暟鎴栫櫨鍒嗘暟锛�
+ const formatPassRate = val => {
+ if (val === null || val === undefined || val === "") return "-";
+ const n = Number(val);
+ if (Number.isNaN(n)) return String(val);
+ if (n > 0 && n <= 1) return `${(n * 100).toFixed(1)}%`;
+ return `${Number.isInteger(n) ? n : Number(n.toFixed(1))}%`;
+ };
+
+ const getPassRateTagType = val => {
+ if (val === null || val === undefined || val === "") return "info";
+ let n = Number(val);
+ if (Number.isNaN(n)) return "info";
+ if (n > 0 && n <= 1) n *= 100;
+ if (n >= 100) return "success";
+ if (n >= 60) return "warning";
+ return "error";
};
// 鑾峰彇鐘舵�佹爣绛剧被鍨�
--
Gitblit v1.9.3