From fe167dd71a1300aeae07522db990d6b3fdb77a0e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 12 三月 2026 13:26:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_中兴实强
---
src/views/productionManagement/productionProcess/index.vue | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index 4f3f3ef..ffe13fc 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -99,6 +99,10 @@
prop: "name",
},
{
+ label: "宸ュ簭绫诲瀷",
+ prop: "typeText",
+ },
+ {
label: "宸ヨ祫瀹氶",
prop: "salaryQuota",
},
@@ -175,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