From b22fc95b319747ef4bdc7c633b18eaa297fc02c4 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Fri, 10 May 2019 11:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/Inboundscanning.js | 2 +- src/views/Inventory/Inboundscanning/index.vue | 118 ++++++++++++------ 2 files changed, 84 insertions(+), 36 deletions(-) diff --git a/src/api/Inventory/Inboundscanning.js b/src/api/Inventory/Inboundscanning.js index b2e2d786..92e8ae6c 100644 --- a/src/api/Inventory/Inboundscanning.js +++ b/src/api/Inventory/Inboundscanning.js @@ -7,7 +7,7 @@ export function searchTable(partnumber) { data: { type: '1', name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号', - param: '工艺计划流水号=' + partnumber + '=string' + param: '工艺计划流水号=' + partnumber } }) } diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index f4c43c7b..f1c3b6ca 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -92,7 +92,7 @@ export default { ace: 0, a: '', tableData: [], - partNumber: '', + partNumber: [], listLoading: false, craftplannumber: '', radio2: 3, @@ -153,10 +153,12 @@ export default { }, // 根据图号查流水号并查表1 getCraftNumber() { - this.partNumber = '' + this.partNumber = [] CraftNumber(this.Partpaint).then(response => { - if (response.data.length > 0 && response.data[0].工艺计划流水号) { - this.partNumber = response.data[0].工艺计划流水号 + for (let i = 0; i < response.data.length; i++) { + this.partNumber.push( + response.data[i].工艺计划流水号 + ) } }).then(() => { this.getscantable() @@ -166,50 +168,96 @@ export default { getPaint() { searchPartNumber(this.partNumber).then(response => { this.Partpaint = response.data[0].零件图号 + return this.Partpaint + }).then(() => { + this. getCraftNumber() }) - this.getscantable() + // this.getscantable() }, // 根据流水号查询 getscantable() { - if (this.partNumber === '' || this.partNumber === null) { - this.$message.error('请输入正确零件号') + this.tableData = [] + if (this.partNumber.length === 0) { + this.$notify({ + title: '警告', + message: '请输入正确的零件图号', + type: 'warning' + }) } else { this.listLoading = true searchTable(this.partNumber).then(response => { - console.log(response.data) - if (response.data.length === 0) { + if(response.data.length === 0) { this.listLoading = false - this.$message.warning('该零件未加工完成') - } else if (response.data[0].考核状态 === 8) { - this.listLoading = false - this.$message.warning('该零件已入库') - } else if (response.data[0].考核状态 === 9) { - this.listLoading = false - this.$message.warning('该零件已出库') - } else if (response.data[0].考核状态 === 7) { - for (let i = 0; i < this.tableData.length; i++) { - if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) { - this.ace = this.ace + 1 + this.$notify({ + title: '警告', + message: '该零件未加工完成', + type: 'warning' + }) + }else { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].考核状态 === 8) { + this.listLoading = false + this.$notify({ + title: '警告', + message: 'P' + response.data[i].工艺计划流水号 + '已入库', + type: 'warning' + }) + } else if (response.data[i].考核状态 === 9) { + this.listLoading = false + this.$notify({ + title: '警告', + message: 'P' + response.data[i].工艺计划流水号 + '已出库', + type: 'warning' + }) + } else if (response.data[i].考核状态 === 7) { + this.listLoading = false + this.tableData.push({ + plannumber: response.data[0].剩余数量, + innumber: response.data[0].入库数量, + capture: '', + note: '', + 工艺计划流水号: response.data[0].工艺计划流水号, + 项目名称: response.data[0].项目名称, + 机床图号: response.data[0].机床图号, + 零件图号: response.data[0].零件图号 + }) } } - if (this.ace === 0) { - this.tableData.push({ - plannumber: response.data[0].剩余数量, - innumber: response.data[0].入库数量, - capture: '', - note: '', - 工艺计划流水号: response.data[0].工艺计划流水号, - 项目名称: response.data[0].项目名称, - 机床图号: response.data[0].机床图号, - 零件图号: response.data[0].零件图号 - }) - } else { - this.$message.error('此件已在列表中') - } } + + // if (response.data.length === 0) { + // this.listLoading = false + // this.$message.warning('该零件未加工完成') + // } else if (response.data[0].考核状态 === 8) { + // this.listLoading = false + // this.$message.warning('该零件已入库') + // } else if (response.data[0].考核状态 === 9) { + // this.listLoading = false + // this.$message.warning('该零件已出库') + // } else if (response.data[0].考核状态 === 7) { + // for (let i = 0; i < this.tableData.length; i++) { + // if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) { + // this.ace = this.ace + 1 + // } + // } + // if (this.ace === 0) { + // this.tableData.push({ + // plannumber: response.data[0].剩余数量, + // innumber: response.data[0].入库数量, + // capture: '', + // note: '', + // 工艺计划流水号: response.data[0].工艺计划流水号, + // 项目名称: response.data[0].项目名称, + // 机床图号: response.data[0].机床图号, + // 零件图号: response.data[0].零件图号 + // }) + // } else { + // this.$message.error('此件已在列表中') + // } + // } }).then(() => { this.listLoading = false - this.ace = 0 + // this.ace = 0 }) } },