From 85734cec67cfea4243776e224eaadd89dd1a25fc Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 24 Jun 2019 15:16:47 +0800 Subject: [PATCH 1/2] bugfix --- src/views/ManufacturingCenter/TraceabilityOfParts/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue index 064406cf..00abcfba 100644 --- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue +++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue @@ -335,10 +335,14 @@ export default { this.sudokus = [] this.show = false this.active = '' + this.active1 = '' this.confirmationTime = '请查询' this.Cutter = '请查询' this.isMaterials = '请查询' this.materialsType = '请查询' + this.isOut = '请查询' + this.outName = '请查询' + this.outTime = '请查询' for (let i = 0; i < this.activities.length; i++) { this.activities[i].type = '' } From b0b3f80bb1ad3aca6357d544a43bb7ceacc2f3d6 Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 24 Jun 2019 16:40:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityInspectionInformationInquiry.js | 12 +++ .../Assembly/AssemblyExecution/index.vue | 13 ++- .../index.vue | 94 +++++++++++++++++-- 3 files changed, 107 insertions(+), 12 deletions(-) diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index f01bf070..9f04373e 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -59,3 +59,15 @@ export function searchPic(num) { } }) } +// 查询外协到货单明细 +export function searchTableDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '质检管理_质检数据_查询数据', + param: `检测类型=${params[0]}&质检流水号=${params[1]}` + } + }) +} diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index 1d6d3e95..065bb029 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -151,10 +151,15 @@ export default { searchTable1() { this.tableData1 = [] if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } - searchTable1(this.machineNumberValue, this.check2).then(response => { - this.tableData1 = response.data - console.log(response.data, 1111) - }) + if (this.check2 === 0) { + this.tableData1 = [] + this.tableData2 = [] + } else { + searchTable1(this.machineNumberValue, this.check2).then(response => { + this.tableData1 = response.data + console.log(response.data, 1111) + }) + } }, searchTable2() { this.tableData2 = [] diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index abe7b529..56b577c8 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -52,11 +52,6 @@ - - - - + @@ -122,6 +117,81 @@ {{ scope.row.备注 }} + + + + + + + + +