diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 0f256c41..b8f4377f 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi export default { data() { return { + num: 0, arrest: [], all: false, partName: '', @@ -114,9 +115,12 @@ export default { this.$message.warning('请选择零件') } else { for (let i = 0; i < this.arrest.length; i++) { - edit(this.arrest[i].工艺计划流水号) - handlechange(this.arrest[i].工序流水号, '0000') - if (i === this.arrest.length - 1) { + edit(this.arrest[i].工艺计划流水号).then(() => { + handlechange(this.arrest[i].工序流水号, '0000').then(response => { + this.num = this.num + response.data[0].result + }) + }) + if (this.num === this.arrest.length) { this.searchTable() } } diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index 1a240dce..b6523571 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -255,7 +255,7 @@ - + { + console.log(response) this.table = response.data this.装箱单名称 = response.data[0].装箱单名称 this.发货单号 = response.data[0].发货单号 @@ -1318,7 +1319,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() }, callOffDownLoadDelivery() {