From 739f2594a8cb3ac4f77d84e228aa4430d448670d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 13 三月 2026 14:03:25 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

---
 src/views/productionPlan/productionPlan/index.vue |   78 +++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 88aedf3..9e4c098 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -359,10 +359,23 @@
 
   const tableColumn = ref([
     {
+      label: "鏁版嵁鏉ユ簮",
+      width: "100px",
+      prop: "dataSourceType",
+      dataType: "tag",
+      formatType: params => {
+        const typeMap = {
+          2: "warning",
+          1: "primary",
+        };
+        return typeMap[params] || "info";
+      },
+      formatData: cell => (cell == 1 ? "閽夐拤鍚屾" : "鎵嬪姩鏂板"),
+    },
+    {
       label: "鐢宠鍗曠紪鍙�",
       prop: "applyNo",
       width: "150px",
-      className: "code-cell",
     },
     {
       label: "瀹㈡埛鍚嶇О",
@@ -372,14 +385,15 @@
     {
       label: "浜у搧鍚嶇О",
       prop: "productName",
-      width: "100px",
+      width: "200px",
       dataType: "tag",
       formatType: params => {
-        const typeMap = {
-          鏉挎潗: "primary",
-          鐮屽潡: "info",
-        };
-        return typeMap[params] || "info";
+        // const typeMap = {
+        //   鏉挎潗: "primary",
+        //   鐮屽潡: "warning",
+        // };
+        // return typeMap[params] || "info";
+        return "primary";
       },
     },
     {
@@ -392,12 +406,10 @@
       label: "鐗╂枡缂栫爜",
       prop: "materialCode",
       width: "150px",
-      className: "code-cell",
     },
     {
       label: "鍧楁暟",
       prop: "quantity",
-      className: "quantity-cell",
       formatData: cell => (cell ? `${cell}鍧梎 : ""),
     },
     {
@@ -408,11 +420,34 @@
       formatData: cell => (cell ? `${cell}鏂筦 : ""),
     },
     {
+      label: "涓嬪彂鐘舵��",
+      prop: "status",
+      width: "150px",
+      className: "status-cell",
+      dataType: "tag",
+      formatType: params => {
+        const typeMap = {
+          0: "warning",
+          1: "primary",
+          2: "info",
+        };
+        return typeMap[params] || "info";
+      },
+      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,18 +491,15 @@
       label: "寮哄害",
       prop: "strength",
     },
-    {
-      label: "鏁版嵁鏉ユ簮",
-      width: "100px",
-      prop: "dataSourceType",
-      formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
-    },
+
     {
       label: "澶囨敞 1",
+      width: "150px",
       prop: "remarkOne",
     },
     {
       label: "澶囨敞 2",
+      width: "150px",
       prop: "remarkTwo",
     },
 
@@ -484,6 +516,7 @@
           link: true,
           showHide: row => {
             return row.status == 0;
+            //status锛�0锛氬緟涓嬪彂锛�1锛氶儴鍒嗕笅鍙戯紝2锛氬凡涓嬪彂
           },
           clickFun: row => {
             handleEdit(row);
@@ -620,6 +653,7 @@
     productMaterialSkuId: [
       { required: true, message: "璇烽�夋嫨浜у搧瑙勬牸", trigger: "change" },
     ],
+    volume: [{ required: true, message: "璇疯緭鍏ユ柟鏁�", trigger: "blur" }],
     productMaterialId: [
       { required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
     ],
@@ -1127,8 +1161,16 @@
   const handleSubmit = () => {
     formRef.value.validate(valid => {
       if (valid) {
+        if (form.volume === 0) {
+          proxy.$modal.msgError("鏂规暟涓嶈兘涓�0");
+          return;
+        }
+        if (form.v === "add") {
+          payload.id = null;
+        }
         const payload = { ...form };
         if (operationType.value === "add") {
+          payload.id = null;
           productionPlanAdd(payload)
             .then(() => {
               proxy.$modal.msgSuccess(
@@ -1214,7 +1256,6 @@
         color: #ffffff;
         border-bottom: none;
         padding: 16px 0;
-        font-size: 14px;
         letter-spacing: 0.5px;
       }
     }
@@ -1237,7 +1278,6 @@
           border-bottom: 1px solid #f0f0f0;
           padding: 14px 0;
           color: #303133;
-          font-size: 13px;
         }
       }
 
@@ -1256,7 +1296,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 +1320,6 @@
       // 鏃ユ湡瀛楁鏍峰紡
       .date-cell {
         color: #909399;
-        font-size: 12px;
         font-style: italic;
       }
 

--
Gitblit v1.9.3