From 6c6d53801616c637a06bd50ddd94b9643c8246b6 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期日, 27 四月 2025 18:00:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

---
 src/views/mainPlan/platePlanList/index.vue    |    2 +-
 src/views/basicData/standardProcess/index.vue |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/views/basicData/standardProcess/index.vue b/src/views/basicData/standardProcess/index.vue
index 5625f8c..6f58e01 100644
--- a/src/views/basicData/standardProcess/index.vue
+++ b/src/views/basicData/standardProcess/index.vue
@@ -430,6 +430,12 @@
     width: 150,
     align: "center",
   },
+  {
+    title: "涓撲笟",
+    field: "major",
+    width: 150,
+    align: "center",
+  },
 ]);
 
 const data = reactive({
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index 5bd2ac7..4297ece 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -330,7 +330,7 @@
     },
   ]);
   newArray.splice(2, 0, {
-    title: "鐒婃帴浠堕綈濂楀紑宸ユ椂闂�",
+    title: "鐒婃帴浠堕綈濂楀紑濮嬫椂闂�",
     field: "hanjie_startDate",
     width: 140,
   });

--
Gitblit v1.9.3