diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index 9506ffba..24a83bdc 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -403,7 +403,7 @@ export default { const data = response.data.rows console.log(data) for (let i = 0; i < data.length; i++) { - data[i].审批通过 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false + data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false } this.tableDataExchange = data this.total1 = response.data.total diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index d8acc84e..a1b44d7b 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -184,6 +184,7 @@ export default { if (response.data[0].result === '1') { ListDetailOut(row.领料单明细流水号) this.$message.success('出库成功') + this.searchListDetailt() } else { this.$message.error('出库失败') } }) } else if (row.零件类型 === 1 || row.零件类型 === 2) { @@ -191,6 +192,7 @@ export default { if (response.data[0].result === '1') { ListDetailOut(row.领料单明细流水号) this.$message.success('出库成功') + this.searchListDetailt() } else { this.$message.error('出库失败') } }) } else { @@ -198,10 +200,10 @@ export default { if (response.data[0].result === '1') { this.$message.success('出库成功') ListDetailOut(row.领料单明细流水号) + this.searchListDetailt() } else { this.$message.error('增加失败') } }) } - this.searchListDetailt() } } } diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index a5997c08..f7f49781 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -787,6 +787,7 @@ export default { this.materialType = row.零件类型名称 this.materialNumber = row.零件图号 this.enableOut = row.可出库数量 + this.purchaseDetailNum = row.采购合同明细流水号 }, addBasicListDetail(formName) { if (this.pickingListNumberx === '') { @@ -796,9 +797,10 @@ export default { } else { this.$refs[formName].validate((valid) => { if (valid) { - addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0, this.materialLocate).then(response => { + addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialNumber, this.materialType, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') + this.searchPartinfo() } else { this.$message.error('增加失败') } @@ -842,6 +844,7 @@ export default { addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') + this.searchPartinfo() } else { this.$message.error('增加失败') } @@ -884,6 +887,7 @@ export default { addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') + this.searchPartinfo() } else { this.$message.error('增加失败') }