From 11579f9a1146526fddc1361c7f22aed5ee57e29a Mon Sep 17 00:00:00 2001 From: "liulujia@meswork.com" Date: Wed, 5 Feb 2020 10:51:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?202025V2llj=E6=81=A2=E5=A4=8D=E7=A8=8B?= =?UTF-8?q?=E5=BA=8FV2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePreparationBill/index.vue | 119 ++++++++------- .../RequestOutsourcingMaterials/index.vue | 138 +++++++++--------- 2 files changed, 125 insertions(+), 132 deletions(-) diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index db98467d..595f97a0 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -51,39 +51,38 @@ 未分配 - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
{ - searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => { - console.log(response) - if (response.data.total === 0) { - this.loading = false - } else { + if (response.data.total === 0) { + this.loading = false + } else { // this.tableData.push({ // 重量: response.data.rows[0].重量 // }) - this.Data = response.data.rows - this.total = response.data.total - } - }).then(() => { - for (let i = 0; i < this.Data.length; i++) { - searchtable2(this.Data[i].工艺计划流水号).then(response => { - this.tableData.push({ - 工艺计划流水号: this.Data[i].工艺计划流水号, - 零件名称: this.Data[i].零件名称, - 零件图号: this.Data[i].零件图号, - 备料打印: this.Data[i].备料打印, - 是否外购备料: this.Data[i].是否外购备料, - 工艺要求: response.data[0].工艺要求, - 材料: this.Data[i].材料, - 重量: this.Data[i].重量, - 批次数量: this.Data[i].批次数量 - }) + this.Data = response.data.rows + this.total = response.data.total + } + }).then(() => { + for (let i = 0; i < this.Data.length; i++) { + searchtable2(this.Data[i].工艺计划流水号).then(response => { + this.tableData.push({ + 工艺计划流水号: this.Data[i].工艺计划流水号, + 零件名称: this.Data[i].零件名称, + 零件图号: this.Data[i].零件图号, + 备料打印: this.Data[i].备料打印, + 是否外购备料: this.Data[i].是否外购备料, + 工艺要求: response.data[0].工艺要求, + 材料: this.Data[i].材料, + 重量: this.Data[i].重量, + 批次数量: this.Data[i].批次数量 }) - this.loading = false - } - }) + }) + this.loading = false + } }) }, handleSelectionChange(val) { diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue index 05fdda97..58c26498 100644 --- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue +++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue @@ -1,6 +1,6 @@