From de4e098a962e8403d9b32590f0acba025b8072f6 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 14 三月 2026 17:51:27 +0800
Subject: [PATCH] 一些修改

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

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 9e4c098..d2a3efd 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -18,7 +18,7 @@
                     @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="浜у搧瑙勬牸:">
-          <el-input v-model="searchForm.specification"
+          <el-input v-model="searchForm.model"
                     placeholder="璇疯緭鍏�"
                     clearable
                     style="width: 160px;"
@@ -102,7 +102,7 @@
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="浜у搧瑙勬牸">
-              <div class="info-display">{{ mergeForm.specification || '-' }}</div>
+              <div class="info-display">{{ mergeForm.model || '-' }}</div>
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -251,9 +251,9 @@
                      filterable
                      placeholder="璇烽�夋嫨">
             <el-option v-for="item in specificationOptions"
-                       :key="item.skuId"
-                       :label="item.specification"
-                       :value="item.skuId" />
+                       :key="item.id"
+                       :label="item.model"
+                       :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="鍧楁暟"
@@ -398,7 +398,7 @@
     },
     {
       label: "浜у搧瑙勬牸",
-      prop: "specification",
+      prop: "model",
       width: "150px",
       className: "spec-cell",
     },
@@ -549,7 +549,7 @@
             mergeForm.ids = [row.id];
             mergeForm.materialCode = row.materialCode;
             mergeForm.productName = row.productName || "";
-            mergeForm.specification = row.specification || "";
+            mergeForm.model = row.model || "";
             mergeForm.length = row.length || 0;
             mergeForm.width = row.width || 0;
             mergeForm.height = row.height || 0;
@@ -591,7 +591,7 @@
   const mergeForm = reactive({
     materialCode: "",
     productName: "",
-    specification: "",
+    model: "",
     length: 0,
     width: 0,
     height: 0,
@@ -632,7 +632,7 @@
     productMaterialId: undefined,
     productMaterialSkuId: undefined,
     productName: "",
-    specification: "",
+    model: "",
     materialCode: "",
     quantity: 0,
     volume: 0,
@@ -699,7 +699,7 @@
       if (item.materialList && item.materialList.length > 0) {
         newItem.children = item.materialList.map(material => ({
           value: material.id, // 浣跨敤material鐨刬d浣滀负value
-          label: material.materialName, // 浣跨敤materialName浣滀负label
+          label: material.productName, // 浣跨敤materialName浣滀负label
         }));
       }
 
@@ -712,28 +712,26 @@
     fetchSpecificationOptions(value);
   };
 
-  const fetchSpecificationOptions = materialId => {
+  const fetchSpecificationOptions = productId => {
     specificationOptions.value = [];
-    if (materialId) {
-      modelListPage({ materialId: materialId, size: -1, current: -1 }).then(
-        res => {
-          specificationOptions.value = res.data.records;
-        }
-      );
+    if (productId) {
+      modelListPage({ productId: productId, size: -1, current: -1 }).then(res => {
+        specificationOptions.value = res.data.records;
+      });
     }
   };
 
   const handleChangeSpecification = value => {
     form.materialCode = undefined;
     const selectedModel = specificationOptions.value.find(
-      item => item.skuId === value
+      item => item.id === value
     );
     if (selectedModel) {
       form.materialCode = selectedModel.materialCode;
       // 瑙ｆ瀽瑙勬牸瀛楃涓茶幏鍙栭暱瀹介珮
-      const specification = selectedModel.specification;
-      if (specification) {
-        const dimensions = specification.match(/^(\d+)\*(\d+)\*(\d+)$/);
+      const model = selectedModel.model;
+      if (model) {
+        const dimensions = model.match(/^(\d+)\*(\d+)\*(\d+)$/);
         if (dimensions && dimensions.length === 4) {
           form.length = parseInt(dimensions[1]);
           form.width = parseInt(dimensions[2]);
@@ -818,7 +816,7 @@
     searchForm: {
       customerName: "",
       productName: "",
-      specification: "",
+      model: "",
       materialCode: "",
       applyNo: "",
       dateRange: [],
@@ -838,7 +836,7 @@
     Object.assign(searchForm.value, {
       customerName: "",
       productName: "",
-      specification: "",
+      model: "",
       materialCode: "",
       applyNo: "",
       dateRange: [],
@@ -955,7 +953,7 @@
     const firstRow = selectedRows.value[0];
     mergeForm.materialCode = selectedserialNo.value;
     mergeForm.productName = firstRow.productName || "";
-    mergeForm.specification = firstRow.specification || "";
+    mergeForm.model = firstRow.model || "";
     mergeForm.length = firstRow.length || 0;
     mergeForm.width = firstRow.width || 0;
     mergeForm.height = firstRow.height || 0;
@@ -1091,7 +1089,7 @@
       productName: "",
       productMaterialId: undefined,
       productMaterialSkuId: undefined,
-      specification: "",
+      model: "",
       materialCode: "",
       quantity: 0,
       volume: 0,
@@ -1118,7 +1116,7 @@
       productName: row.productName || "",
       productMaterialId: row.productMaterialId || undefined,
       productMaterialSkuId: row.productMaterialSkuId || undefined,
-      specification: row.specification || "",
+      model: row.model || "",
       materialCode: row.materialCode || "",
       quantity: row.quantity || 0,
       volume: row.volume || 0,

--
Gitblit v1.9.3