diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index c7d93675..7dd0c706 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -52,27 +52,26 @@ export function initPartDrawing(check1, name) { }) } // 查询外购备料 -export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) { +export function searchPurchasedMaterials(check1, name) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_查询数据', - param: `零件图号_check=${check1}&零件图号=${name}`, - Pagination: pageCurrent + '&' + pageSize + param: `零件图号_check=${check1}&零件图号=${name}` } }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) { +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划_查询数据', - param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index e8cec860..3a1598d6 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -37,14 +37,14 @@ export function searchMateriel(num, num1) { }) } // 查询到货单 -export function searchArriveOrder(num, num1, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num, num1, num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商名称_check=${num}&供应商名称=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商名称_check=${num}&供应商名称=${num1}&供应商名称_check=${num8}&供应商名称=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index eb372cbd..da6efd9a 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -1,72 +1,35 @@ -
+
采购计划单号: 供应商: - + + + + 查询 @@ -354,6 +361,7 @@ export default { purchasingOrder: '', // 采购单号 purchasingOrderNumber: '', // 采购计划流水号 supplierName0: '', // 供应商名称（外面的） + supplierName0s: [], // 供应商名称（外面的） supplierName: '', // 供应商名称 tableData2: [], total2: 0, @@ -435,6 +443,10 @@ export default { label: response.data[i].供应商名称, value: response.data[i].供应商流水号 }) + this.supplierName0s.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) } }) searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => { @@ -509,8 +521,9 @@ export default { searchTable1() { // 查询外购备料 this.loading1 = true this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0 - searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => { - this.tableData1 = response.data.rows + // this.pageCurrent1, this.pageSize1, + searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => { + this.tableData1 = response.data this.total1 = response.data.total this.loading1 = false }) @@ -533,7 +546,7 @@ export default { searchTable2() { // 查询采购单列表 this.purchasingOrder ? this.check3 = 1 : this.check3 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0 - searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName0).then(response => { + searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 715dcbaf..cbaeb005 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -3,7 +3,14 @@
供应商: - + + + + 时间段: { + for (let i = 0; i < response.data.length; i++) { + this.supplierName.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) + } + }) + }, searchCailiao() { this.Cailiao = [] searchCailiao(this.供应商111).then(response => { @@ -637,14 +657,14 @@ export default { searchTable4() { this.tableData5 = [] this.tableData6 = [] - this.Name ? this.check = 1 : this.check = 0 + this.supplierNameValue ? this.check = 1 : this.check = 0 this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') if (this.PickingValue === 0 || this.PickingValue === 1) { this.check2 = 1 } else { this.check2 = 0 } - searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { + searchArriveOrder(0, 0, this.check, this.supplierNameValue, this.check1, this.dateRange[0], this.dateRange[1], this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { this.tableData4 = response.data.rows this.total4 = response.data.total }) diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index ee0d84a3..293c3b67 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -1,35 +1,36 @@