From ce829582be1a8b53a330d1409e09325414f59e43 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材

---
 src/views/productionPlan/productionPlan/index.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 88aedf3..b99e86f 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -359,6 +359,12 @@
 
   const tableColumn = ref([
     {
+      label: "鏁版嵁鏉ユ簮",
+      width: "100px",
+      prop: "dataSourceType",
+      formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
+    },
+    {
       label: "鐢宠鍗曠紪鍙�",
       prop: "applyNo",
       width: "150px",
@@ -372,7 +378,7 @@
     {
       label: "浜у搧鍚嶇О",
       prop: "productName",
-      width: "100px",
+      width: "200px",
       dataType: "tag",
       formatType: params => {
         const typeMap = {
@@ -408,11 +414,25 @@
       formatData: cell => (cell ? `${cell}鏂筦 : ""),
     },
     {
+      label: "涓嬪彂鐘舵��",
+      prop: "status",
+      width: "150px",
+      className: "status-cell",
+      formatData: cell => {
+        const statusMap = {
+          0: "寰呬笅鍙�",
+          1: "閮ㄥ垎涓嬪彂",
+          2: "宸蹭笅鍙�",
+        };
+        return statusMap[cell] || "";
+      },
+    },
+    {
       label: "宸蹭笅鍙戞柟鏁�",
       prop: "assignedQuantity",
       width: "150px",
       className: "spec-cell",
-      formatData: cell => (cell ? `${cell}鏂筦 : ""),
+      formatData: cell => (cell ? `${cell}鏂筦 : 0),
     },
     {
       label: "闀�",
@@ -456,12 +476,7 @@
       label: "寮哄害",
       prop: "strength",
     },
-    {
-      label: "鏁版嵁鏉ユ簮",
-      width: "100px",
-      prop: "dataSourceType",
-      formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
-    },
+
     {
       label: "澶囨敞 1",
       prop: "remarkOne",
@@ -484,6 +499,7 @@
           link: true,
           showHide: row => {
             return row.status == 0;
+            //status锛�0锛氬緟涓嬪彂锛�1锛氶儴鍒嗕笅鍙戯紝2锛氬凡涓嬪彂
           },
           clickFun: row => {
             handleEdit(row);
@@ -1214,7 +1230,6 @@
         color: #ffffff;
         border-bottom: none;
         padding: 16px 0;
-        font-size: 14px;
         letter-spacing: 0.5px;
       }
     }
@@ -1237,7 +1252,6 @@
           border-bottom: 1px solid #f0f0f0;
           padding: 14px 0;
           color: #303133;
-          font-size: 13px;
         }
       }
 
@@ -1256,7 +1270,6 @@
         font-weight: 600;
         color: #409eff;
         font-family: "Courier New", monospace;
-        font-size: 14px;
         text-shadow: 0 1px 2px rgba(64, 158, 255, 0.2);
       }
 
@@ -1281,7 +1294,6 @@
       // 鏃ユ湡瀛楁鏍峰紡
       .date-cell {
         color: #909399;
-        font-size: 12px;
         font-style: italic;
       }
 

--
Gitblit v1.9.3