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 @@ > - 库存:{{ item.storageNum }} + 出库:{{ item.num }} @@ -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,