From e39bf94b60de81df060cdcf460e57d19f50aa5d1 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 23 五月 2026 15:02:43 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro_鹤壁' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_NEW_pro_鹤壁
---
src/pages/qualityManagement/processInspection/index.vue | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/pages/qualityManagement/processInspection/index.vue b/src/pages/qualityManagement/processInspection/index.vue
index 14e66ef..8f0d064 100644
--- a/src/pages/qualityManagement/processInspection/index.vue
+++ b/src/pages/qualityManagement/processInspection/index.vue
@@ -76,10 +76,11 @@
</view>
</view>
<view class="status-tags">
- <u-tag :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"
@@ -117,29 +118,29 @@
</view>
<!-- 鎿嶄綔鎸夐挳 -->
<view class="action-buttons">
- <!-- <u-button type="primary"
+ <u-button type="primary"
size="small"
class="action-btn"
:disabled="item.inspectState"
@click.stop="startInspection(item)">
缂栬緫
- </u-button> -->
+ </u-button>
<u-button type="info"
size="small"
class="action-btn"
@click.stop="viewDetail(item)">
璇︽儏
</u-button>
- <!-- <u-button type="success"
+ <u-button type="success"
size="small"
class="action-btn"
:disabled="item.inspectState"
@click.stop="submitInspection(item)">
鎻愪氦
- </u-button> -->
+ </u-button>
</view>
<view class="action-buttons">
- <!-- <u-button type="info"
+ <u-button type="info"
size="small"
class="action-btn"
@click.stop="viewFileList(item)">
@@ -151,7 +152,7 @@
:disabled="item.inspectState || item.checkName !== ''"
@click.stop="assignInspector(item)">
鍒嗛厤妫�楠屽憳
- </u-button> -->
+ </u-button>
</view>
</view>
</view>
@@ -163,12 +164,12 @@
</view>
<!-- 鍒嗛〉缁勪欢 -->
<!-- 娴姩鏂板鎸夐挳 -->
- <!-- <view class="fab-button"
+ <view class="fab-button"
@click="addInspection">
<up-icon name="plus"
size="24"
color="#ffffff"></up-icon>
- </view> -->
+ </view>
<!-- 鏃ユ湡閫夋嫨鍣� -->
<up-popup v-model:show="showDate"
mode="date"
@@ -315,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}%`;
};
// 鑾峰彇鐘舵�佹爣绛剧被鍨�
@@ -382,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