From 1e00770dddc0bdf350f6121256d885879f550629 Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期五, 25 四月 2025 20:46:32 +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 |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index 5e9548d..0e3de41 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -174,11 +174,6 @@
     width: 160,
     fixed:"left"
   },
-  // {
-  //   title: "褰撳墠宸ュ簭鍙�",
-  //   field: "processNumber",
-  //   width: 150,
-  // },
   {
     title: "闇�姹傚垎绫�",
     field: "requirementType",
@@ -192,6 +187,11 @@
     fixed:"left"
   },
   {
+    title: "瀹℃牳鏃堕棿",
+    field: "updateBy",
+    width: 100
+  },
+  {
     title: "褰撳墠宸ュ簭",
     field: "workCenter",
     width: 200,
@@ -200,6 +200,11 @@
     title: "褰撳墠宸ュ簭璐熻矗浜�",
     field: "department",
     width: 200,
+  },
+  {
+    title: "涓嬩竴宸ュ簭",
+    field: "updateBy",
+    width: 100
   },
   {
     title: "涓嬩竴宸ュ簭宸ュ簭璐熻矗浜�",
@@ -225,10 +230,20 @@
     type: "html",
   },
   {
+    title: "浣庨樁鐮�",
+    field: "updateBy",
+    width: 100
+  },
+  {
     title: "鐢熶骇鏁伴噺",
     field: "productionQuantity",
     width: 100,
     type: "html",
+  },
+  {
+    title: "宸ュ崟璁″垝涓嬪彂鏃堕棿",
+    field: "updateBy",
+    width: 200
   },
   {
     title: "绯荤粺瀹屽伐鏃堕棿",
@@ -306,6 +321,11 @@
       },
     },
   ]);
+  newArray.splice(2,0,{
+     title: "鐒婃帴浠堕綈濂楀紑濮嬫椂闂�",
+     field:"hanjie_startDate",
+     width: 140,
+  })
   await nextTick();
   columns.value = [...columns.value, ...newArray];              // 寮哄埗缁勪欢閲嶆柊娓叉煋
   

--
Gitblit v1.9.3