From e82c8c9c6c3072c5b8e8d1ff4b8422825765c1f7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 09 三月 2026 09:57:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/views/productionManagement/productionProcess/index.vue |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index 67430cb..ffe13fc 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -98,10 +98,20 @@
       label: "宸ュ簭鍚嶇О",
       prop: "name",
     },
-
+    {
+      label: "宸ュ簭绫诲瀷",
+      prop: "typeText",
+    },
     {
       label: "宸ヨ祫瀹氶",
       prop: "salaryQuota",
+    },
+    {
+      label: "鏄惁璐ㄦ",
+      prop: "isQuality",
+      formatData: (params) => {
+        return params ? "鏄�" : "鍚�";
+      },
     },
     {
       label: "澶囨敞",
@@ -169,6 +179,7 @@
         tableLoading.value = false;
         tableData.value = res.data.records.map(item => ({
           ...item,
+          typeText: item.type !== undefined && item.type !== null ? (item.type === 0 ? "璁℃椂" : "璁′欢") : "",
         }));
         page.total = res.data.total;
       })

--
Gitblit v1.9.3