From 3cd1f36946834b39cff84c8cbd809851dd817356 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 25 May 2020 11:03:38 +0800 Subject: [PATCH] a --- src/api/ManufacturingCenter/GroupMatching.js | 4 +- .../GroupMatching/index.vue | 83 ++++++++++++++----- 2 files changed, 62 insertions(+), 25 deletions(-) diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index 714731c5..acb2787e 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -118,8 +118,8 @@ export function searchTable02(...params) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, - Pagination: params[4] + '&' + params[5] + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[4]}&零件名称=${params[5]}&排序=${params[8]}`, + Pagination: params[6] + '&' + params[7] } }) } diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 7809fa76..d40ec7b2 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -105,13 +105,14 @@ - + @@ -178,13 +179,14 @@ - + @@ -256,13 +258,14 @@ - + @@ -438,6 +441,9 @@ import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus export default { data() { return { + searchTable0Loading: false, + searchTable1Loading: false, + searchTable2Loading: false, order: 0, order2: 0, order3: 0, @@ -617,9 +623,11 @@ export default { this.Machine ? check1 = 1 : check1 = 0 this.Group ? check2 = 1 : check2 = 0 this.materialName ? check = 1 : check = 0 + this.searchTable0Loading = true searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => { this.tableData00 = response.data.rows this.total00 = response.data.total + this.searchTable0Loading = false }) }, sortChange4(column, prop, order) { @@ -630,6 +638,16 @@ export default { } else { this.order4 = 0 } + let check1, check2, check + this.Machine ? check1 = 1 : check1 = 0 + this.Group ? check2 = 1 : check2 = 0 + this.materialName ? check = 1 : check = 0 + this.searchTable1Loading = true + searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => { + this.tableData01 = response.data.rows + this.total01 = response.data.total + this.searchTable1Loading = false + }) }, sortChange5(column, prop, order) { if (column.order === 'ascending') { @@ -639,6 +657,16 @@ export default { } else { this.order5 = 0 } + let check1, check2, check + this.Machine ? check1 = 1 : check1 = 0 + this.Group ? check2 = 1 : check2 = 0 + this.materialName ? check = 1 : check = 0 + this.searchTable2Loading = true + searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => { + this.tableData02 = response.data.rows + this.total02 = response.data.total + this.searchTable2Loading = false + }) }, turnTo() { this.$router.push({ @@ -729,32 +757,41 @@ export default { }, // 查询标准件 searchTable0() { - let check1, check2 + let check1, check2, check this.Machine ? check1 = 1 : check1 = 0 this.Group ? check2 = 1 : check2 = 0 - searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => { - this.tableData00 = response.data.rows - this.total00 = response.data.total + this.materialName ? check = 1 : check = 0 + this.searchTable1Loading = true + searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => { + this.tableData01 = response.data.rows + this.total01 = response.data.total + this.searchTable1Loading = false }) }, // 查询外购件 searchTable1() { - let check1, check2 + let check1, check2, check this.Machine ? check1 = 1 : check1 = 0 this.Group ? check2 = 1 : check2 = 0 - searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => { + this.materialName ? check = 1 : check = 0 + this.searchTable1Loading = true + searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order3).then(response => { this.tableData01 = response.data.rows this.total01 = response.data.total + this.searchTable1Loading = false }) }, // 查询基本件 searchTable2() { - let check1, check2 + let check1, check2, check this.Machine ? check1 = 1 : check1 = 0 this.Group ? check2 = 1 : check2 = 0 - searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02, this.order5).then(response => { + this.materialName ? check = 1 : check = 0 + this.searchTable2Loading = true + searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => { this.tableData02 = response.data.rows this.total02 = response.data.total + this.searchTable2Loading = false }) }, handleSizeChange(val) {