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 |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index b99e86f..9e4c098 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -362,13 +362,20 @@
       label: "鏁版嵁鏉ユ簮",
       width: "100px",
       prop: "dataSourceType",
-      formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
+      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: "瀹㈡埛鍚嶇О",
@@ -381,11 +388,12 @@
       width: "200px",
       dataType: "tag",
       formatType: params => {
-        const typeMap = {
-          鏉挎潗: "primary",
-          鐮屽潡: "info",
-        };
-        return typeMap[params] || "info";
+        // const typeMap = {
+        //   鏉挎潗: "primary",
+        //   鐮屽潡: "warning",
+        // };
+        // return typeMap[params] || "info";
+        return "primary";
       },
     },
     {
@@ -398,12 +406,10 @@
       label: "鐗╂枡缂栫爜",
       prop: "materialCode",
       width: "150px",
-      className: "code-cell",
     },
     {
       label: "鍧楁暟",
       prop: "quantity",
-      className: "quantity-cell",
       formatData: cell => (cell ? `${cell}鍧梎 : ""),
     },
     {
@@ -418,6 +424,15 @@
       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: "寰呬笅鍙�",
@@ -479,10 +494,12 @@
 
     {
       label: "澶囨敞 1",
+      width: "150px",
       prop: "remarkOne",
     },
     {
       label: "澶囨敞 2",
+      width: "150px",
       prop: "remarkTwo",
     },
 
@@ -636,6 +653,7 @@
     productMaterialSkuId: [
       { required: true, message: "璇烽�夋嫨浜у搧瑙勬牸", trigger: "change" },
     ],
+    volume: [{ required: true, message: "璇疯緭鍏ユ柟鏁�", trigger: "blur" }],
     productMaterialId: [
       { required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" },
     ],
@@ -1143,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(

--
Gitblit v1.9.3