From 044596092e1ac5dd03cdbfe6af3e87de9c2da0ee Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 13 三月 2026 11:00:01 +0800
Subject: [PATCH] 问题修改

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

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index e70fa22..33dbeb0 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -248,6 +248,7 @@
                       prop="productMaterialSkuId">
           <el-select v-model="form.productMaterialSkuId"
                      @change="handleChangeSpecification"
+                     filterable
                      placeholder="璇烽�夋嫨">
             <el-option v-for="item in specificationOptions"
                        :key="item.skuId"
@@ -301,8 +302,14 @@
         </el-form-item>
         <el-form-item label="寮哄害"
                       prop="strength">
-          <el-input v-model="form.strength"
-                    placeholder="璇疯緭鍏ュ己搴�" />
+          <el-select v-model="form.strength"
+                     placeholder="璇烽�夋嫨寮哄害"
+                     style="width: 100%">
+            <el-option label="A3.5"
+                       value="A3.5" />
+            <el-option label="A5.0"
+                       value="A5.0" />
+          </el-select>
         </el-form-item>
         <el-form-item label="澶囨敞 1"
                       prop="remarkOne">
@@ -387,40 +394,46 @@
       label: "鍧楁暟",
       prop: "quantity",
       className: "quantity-cell",
+      formatData: cell => (cell ? `${cell}鍧梎 : ""),
     },
     {
       label: "鏂规暟",
       prop: "volume",
       width: "150px",
       className: "volume-cell",
+      formatData: cell => (cell ? `${cell}鏂筦 : ""),
     },
     {
       label: "宸蹭笅鍙戞柟鏁�",
       prop: "assignedQuantity",
       width: "150px",
       className: "spec-cell",
+      formatData: cell => (cell ? `${cell}鏂筦 : ""),
     },
     {
       label: "闀�",
       prop: "length",
       className: "dimension-cell",
+      formatData: cell => (cell ? `${cell}mm` : ""),
     },
     {
       label: "瀹�",
       prop: "width",
       className: "dimension-cell",
+      formatData: cell => (cell ? `${cell}mm` : ""),
     },
     {
       label: "楂�",
       prop: "height",
       className: "dimension-cell",
+      formatData: cell => (cell ? `${cell}mm` : ""),
     },
-    {
-      label: "娴佹按鍙�",
-      prop: "serialNo",
-      width: "150px",
-      className: "code-cell",
-    },
+    // {
+    //   label: "娴佹按鍙�",
+    //   prop: "serialNo",
+    //   width: "150px",
+    //   className: "code-cell",
+    // },
     {
       label: "璁″垝寮�濮嬫棩鏈�",
       prop: "startDate",
@@ -439,12 +452,12 @@
       label: "寮哄害",
       prop: "strength",
     },
-    // {
-    //   label: "鏁版嵁鏉ユ簮",
-    //   width: "100px",
-    //   prop: "dataSourceType",
-    //   formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
-    // },
+    {
+      label: "鏁版嵁鏉ユ簮",
+      width: "100px",
+      prop: "dataSourceType",
+      formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
+    },
     {
       label: "澶囨敞 1",
       prop: "remarkOne",
@@ -465,6 +478,9 @@
           name: "缂栬緫",
           type: "primary",
           link: true,
+          showHide: row => {
+            return row.status == 0;
+          },
           clickFun: row => {
             handleEdit(row);
           },
@@ -473,6 +489,9 @@
           name: "鍒犻櫎",
           type: "danger",
           link: true,
+          showHide: row => {
+            return row.status == 0;
+          },
           clickFun: row => {
             handleDelete(row);
           },
@@ -480,12 +499,12 @@
         {
           name: "涓嬪彂",
           type: "text",
-          disabled: row => {
+          showHide: row => {
             // 璁＄畻鍓╀綑鏂规暟
             const remainingVolume =
               (row.volume || 0) - (row.assignedQuantity || 0);
             // 濡傛灉鍓╀綑鏂规暟灏忎簬绛変簬0锛岀姝㈤�夋嫨
-            return remainingVolume <= 0;
+            return remainingVolume > 0;
           },
           clickFun: row => {
             // 鍗曠嫭涓嬪彂鎿嶄綔
@@ -658,19 +677,31 @@
   const fetchSpecificationOptions = materialId => {
     specificationOptions.value = [];
     if (materialId) {
-      modelListPage({ materialId: materialId }).then(res => {
-        specificationOptions.value = res.data;
-      });
+      modelListPage({ materialId: materialId, size: -1, current: -1 }).then(
+        res => {
+          specificationOptions.value = res.data.records;
+        }
+      );
     }
   };
 
   const handleChangeSpecification = value => {
     form.materialCode = undefined;
     const selectedModel = specificationOptions.value.find(
-      item => item.id === value
+      item => item.skuId === value
     );
     if (selectedModel) {
       form.materialCode = selectedModel.materialCode;
+      // 瑙ｆ瀽瑙勬牸瀛楃涓茶幏鍙栭暱瀹介珮
+      const specification = selectedModel.specification;
+      if (specification) {
+        const dimensions = specification.match(/^(\d+)\*(\d+)\*(\d+)$/);
+        if (dimensions && dimensions.length === 4) {
+          form.length = parseInt(dimensions[1]);
+          form.width = parseInt(dimensions[2]);
+          form.height = parseInt(dimensions[3]);
+        }
+      }
     }
   };
 

--
Gitblit v1.9.3