From a331ba90fb2e39846f521d821ef5029c7102c2f7 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 8 Jan 2025 15:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=80=80=E6=96=99=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/component/addReturn.vue     | 26 ++++++++++++-------
 .../goodsArrived/component/addTools.vue       |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index d2034e88..3cace772 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -113,7 +113,7 @@
                                 >
                                     <span v-html="highlightText(item.fullPath, searchKeyword)"></span>
                                     <span style="float: right; color: #8492a6; font-size: 13px">
-                                        库存:{{ item.storageNum }}
+                                        出库:{{ item.num }}
                                     </span>
                                 </el-option>
                             </el-select>
@@ -686,22 +686,21 @@ export default {
         },
         // 处理类型数据
         processTypeData(data) {
-            const result = []
-
+            const result = [] 
             const traverse = (node, parents = []) => {
-                const path = [...parents, node.typeName]
-
+                const path = [...parents, node.typeName] 
                 if (!node.children || node.children.length === 0) {
                     result.push({
                         typeId: node.typeId,
                         typeName: node.typeName,
                         fullPath: path.join(' / '),
                         searchKey: path.join('').toLowerCase(),
-                        storageNum: node.storageNum || 0,
+                        num: node.num || 0,
                         maTypeName: parents[parents.length - 1] || '',
                         specificationType: node.typeName,
                         unitName: node.unitName,
-                        unitValue: node.unitValue
+                        unitValue: node.unitValue,
+                        manageType: node.manageType
                     })
                 }
 
@@ -740,14 +739,21 @@ export default {
                         type: 'warning'
                     })
                     this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
-                } else if (typeData.storageNum <= 0) {
-                    this.$message.error('所选物资规格类型暂时无库存，无法申请！')
+                } else if (typeData.num <= 0) {
+                    this.$message.error('所选物资规格类型暂时无出库，无法申请！')
                     this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
                 } else {
+                    console.log(typeData)
                     // 将新项添加到数组开头，实现倒序
                     this.equipmentList.unshift({
                         ...typeData,
-                        preNum: 0
+                        preNum: 0,
+                        typeModel: typeData.typeName,
+                        typeName:typeData.specificationType,
+                        apDetection: '',
+                        remark:'',
+                        maCodeList:[],
+                        bmFileInfos:[]
                     })
                     this.deviceType.push(lastSelected)
                     this.$message({
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 41440d1e..96910ca0 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -683,7 +683,6 @@ export default {
                     // 将新项添加到数组开头，实现倒序
                     this.equipmentList.unshift({
                         ...typeData,
-                        preNum: 0,
                         createTime: null,
                         productionTime: this.maForm.productionTime,
                         purchaseTaxPrice: 0,