diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue index 25dda6d..b58900c 100644 --- a/pages/management/alloc-maintenance.vue +++ b/pages/management/alloc-maintenance.vue @@ -6,7 +6,10 @@ - + + + + @@ -268,6 +271,7 @@ modalObj: {}, disabled: false, value1: '', + value2: '', range1: [], dataList3: [], iid: '', @@ -317,7 +321,7 @@ }, // 一级表格接口 async _allocationPage () { - let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '') + let res = await allocationPage(this.val1, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '') if (res.code === 1) { this.dataList1 = [...res.result] this.totalCount1 = Number(res.totalElements) diff --git a/utils/getData2.js b/utils/getData2.js index 68d45b2..e4a36b2 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -79,11 +79,12 @@ export const getWarehouseInfo = () => request({ data: {} }) // 2.查询调拨单据 -export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({ +export const allocationPage = (fuzzy, drkcbm, dckcbm, page, size) => request({ url:'api/allocationBill/allocationPage', data: { fuzzy: fuzzy, - kczzbm: kczzbm, + drkcbm: drkcbm, + dckcbm: dckcbm, page: page, size: size }