From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/views/qualityManagement/rawMaterialInspection/index.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 2ac595d..7ed40eb 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -144,11 +144,6 @@
     width: 120
   },
   {
-    label: "妫�娴嬪崟浣�",
-    prop: "checkCompany",
-    width: 120
-  },
-  {
     label: "鍚堟牸鐜�",
     prop: "passRate",
     width: 100,
@@ -163,14 +158,17 @@
       if (params == null || params === '') return 'info';
       const n = Number(params);
       if (Number.isNaN(n)) return 'info';
-      if (n >= 100) return 'success';
-      if (n >= 90) return 'warning';
+      if (n === 100) return 'success';
+      if (n >= 75) return 'primary';
+      if (n >= 50) return 'warning';
+      if (n >= 25) return 'danger';
       return 'danger';
     },
   },
   {
     label: "鎻愪氦鐘舵��",
     prop: "inspectState",
+    dataType: "tag",
     formatData: (params) => {
       if (params) {
         return "宸叉彁浜�";
@@ -178,6 +176,13 @@
         return "鏈彁浜�";
       }
     },
+    formatType: (params) => {
+      if (params) {
+        return "success";
+      } else {
+        return "info";
+      }
+    },
   },
   {
     dataType: "action",

--
Gitblit v1.9.3