From f3f5a0c0db0b782401a9a0fcf6176312f420d941 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 25 三月 2026 14:01:19 +0800
Subject: [PATCH] 军泰伟业 1.不要树形结构。根据图纸编号为唯一索引添加产品并可以导入 2.要求可以上传图纸 3.产品可以绑定工艺路线 4.工艺路线改成由工序组成,新增编辑是工序可以挪动顺序 5.工序添加报工权限字段,可以多选人员

---
 src/views/inventoryManagement/receiptManagement/Record.vue |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0b67f42..b85e79b 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -73,7 +73,7 @@
         <el-table-column label="浜у搧澶х被"
                          prop="productName"
                          show-overflow-tooltip/>
-        <el-table-column label="瑙勬牸鍨嬪彿"
+        <el-table-column label="鍥剧焊缂栧彿"
                          prop="model"
                          show-overflow-tooltip/>
         <el-table-column label="鍗曚綅"
@@ -212,17 +212,27 @@
 
 // 鑾峰彇鏉ユ簮绫诲瀷閫夐」
 const fetchStockRecordTypeOptions = () => {
-  if (props.type === 1 || props.type === 2) {
-    findAllQualifiedStockInRecordTypeOptions()
-        .then(res => {
-          stockRecordTypeOptions.value = res.data;
-        })
-  } else {
+  Promise.all([
+    findAllQualifiedStockInRecordTypeOptions(),
     findAllUnQualifiedStockInRecordTypeOptions()
-        .then(res => {
-          stockRecordTypeOptions.value = res.data;
-        })
-  }
+  ])
+    .then(([qualifiedRes, unQualifiedRes]) => {
+      const qualifiedData = qualifiedRes.data || [];
+      const unQualifiedData = unQualifiedRes.data || [];
+      const allData = [...qualifiedData, ...unQualifiedData];
+      const uniqueData = [];
+      const valueSet = new Set();
+      allData.forEach(item => {
+        if (!valueSet.has(item.value)) {
+          valueSet.add(item.value);
+          uniqueData.push(item);
+        }
+      });
+      stockRecordTypeOptions.value = uniqueData;
+    })
+    .catch(() => {
+      stockRecordTypeOptions.value = [];
+    });
 }
 
 // 琛ㄦ牸閫夋嫨鏁版嵁

--
Gitblit v1.9.3