diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index 8c7d0931..940bef99 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -39,7 +39,7 @@ export function searchTable1(...params) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[16]}&排序名称=${params[17]}&PageCount=1=int=output&ItemCount=1=int=output` + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[18]}&排序名称=${params[19]}&PageCount=1=int=output&ItemCount=1=int=output` // Pagination: params[4] + '&' + params[5] } }) @@ -54,7 +54,7 @@ export function searchTable2(...params) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[15]}&排序名称=${params[16]}&PageCount=1=int=output&ItemCount=1=int=output` + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[17]}&排序名称=${params[18]}&PageCount=1=int=output&ItemCount=1=int=output` // Pagination: params[4] + '&' + params[5] } }) diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index 74528f56..f2023bab 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -49,7 +49,7 @@ - + - + - + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e99faa6e..21f7b7d9 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -138,7 +138,7 @@ diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 69695bff..242732ca 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -21,6 +21,7 @@ :value="item.value"/> + - 查询 + 查询 @@ -46,7 +47,7 @@ - + @@ -428,6 +429,7 @@ export default { Name: '', spec: '', model: '', + supplier: '', machineNumberValue: '', machineNumber: [], groupNumberValue: '', @@ -678,15 +680,16 @@ export default { }, searchTable0() { // 查询标准件 this.tableData0 = [] - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.spec ? check4 = 1 : check4 = 0 this.model ? check5 = 1 : check5 = 0 this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') + this.supplier ? check7 = 1 : check7 = 0 this.loading0 = true - searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => { if (response.data.result !== 0) { for (let i = 0; i < response.data.result.length; i++) { this.tableData0.push({ @@ -751,15 +754,16 @@ export default { }, searchTable1() { // 查询外购件 this.tableData1 = [] - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 this.spec ? check4 = 1 : check4 = 0 this.model ? check5 = 1 : check5 = 0 this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') + this.supplier ? check7 = 1 : check7 = 0 this.loading1 = true - searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => { console.log(response.data.result.length, 222) // this.total02 = parseInt(response.data.output[0].ItemCount) @@ -780,6 +784,7 @@ export default { 零件数量: response.data.result[i].零件数量, 数量: response.data.result[i].数量, 离线采购数量: response.data.result[i].离线采购数量, + 使用库存数: response.data.result[i].使用库存数, 已到货数量: response.data.result[i].已到货数量, 离线到货数量: response.data.result[i].离线到货数量, 供应商名称: response.data.result[i].供应商名称, @@ -825,7 +830,7 @@ export default { this.searchTable2() }, searchTable2() { // 查询基本件 - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 @@ -833,7 +838,8 @@ export default { this.model ? check5 = 1 : check5 = 0 this.loading2 = true this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') - searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { + this.supplier ? check7 = 1 : check7 = 0 + searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => { this.tableData2 = response.data.result this.total2 = parseInt(response.data.output[0].ItemCount) this.loading2 = false diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index c06d8206..14bb354a 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -86,8 +86,8 @@ :label="item.label" :value="item.value"/> - 查询 - 已分配 + 查询 + 已分配 @@ -233,8 +233,7 @@ 撤回 @@ -440,8 +439,7 @@