From fabc90da0de8280d67173a497c38707ef80bcaed Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 30 Mar 2020 14:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkshopProcurement/ArrivalStateSearch.js | 5 +- .../ArrivalStateSearch/index.vue | 100 +++++++++++------- 2 files changed, 66 insertions(+), 39 deletions(-) diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index 29211ee2..0f211745 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -16,7 +16,7 @@ export function initArrivalStateContact() { }) } // 查询到货情况 -export function searchArrivalState(num) { +export function searchArrivalState(check1, num1, check2, num2, num3, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -25,7 +25,8 @@ export function searchArrivalState(num) { ModularID: router.currentRoute.path, type: '1', name: '车间管理_到货情况_查询数据_新_成组采购', - param: `采购合同流水号=${num}` + param: `零件名_check=${check1}&零件名=${num1}&采购时间_check=${check2}&采购开始时间=${num2}&采购结束时间=${num3}`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue index 47939403..5b52da8a 100644 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue @@ -1,19 +1,32 @@ @@ -64,16 +88,17 @@ import { initArrivalStateContact, searchArrivalState } from '@/api/WorkshopProcu import { mapGetters } from 'vuex' export default { - name: '', // 项目总价查询 data() { return { - check1: 0, - contractNumValue: '', + billNames: '', + dateRange: '', // 日期 + contractNumValue: '', // 已屏蔽下拉框 contractNum: [], - supplierName: '', tableData: [], - arrival: [], - judge: [] + total1: 0, + pageCurrent1: 1, + pageSize1: 50, + loading1: false } }, computed: { @@ -85,7 +110,7 @@ export default { ]) }, created() { - this.fetchData() + // this.fetchData() }, methods: { fetchData() { @@ -99,34 +124,35 @@ export default { }) }, searchTable() { - searchArrivalState(this.contractNumValue).then(response => { + this.loading1 = true + var check1, check2 + this.billNames ? check1 = 1 : check1 = 0 + this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') + searchArrivalState(check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => { console.log(response.data) - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) { - response.data[i].物料型号 = response.data[i].零件图号 + for (let i = 0; i < response.data.rows.length; i++) { + if (!response.data.rows[i].物料型号) { + response.data.rows[i].物料型号 = response.data.rows[i].零件图号 } } - this.tableData = response.data + this.tableData = response.data.rows + this.total1 = response.data.total + this.loading1 = false }) + }, + handleSizeChange1(val) { + this.pageCurrent1 = 1 + this.pageSize1 = val + this.searchTable() + }, + handleCurrentChange1(val) { + this.pageCurrent1 = val + this.searchTable() } } }