diff --git a/pages/WarehouseManage/SemifinishedInStore.vue b/pages/WarehouseManage/SemifinishedInStore.vue index 34cbc09..5c960d1 100644 --- a/pages/WarehouseManage/SemifinishedInStore.vue +++ b/pages/WarehouseManage/SemifinishedInStore.vue @@ -104,7 +104,7 @@ contentnomore: '没有更多' }, totalCount: 0, - pageNum: 0, + pageNum: 1, pageSize: 10 }; }, @@ -118,10 +118,9 @@ }, /** 初始化查询 */ async _coolIOQuery () { - let res = await coolIOQuery(this.val2) - // this.dataList = [...res.data] - this.totalCount = res.total - if (res.total > 0) { + let res = await coolIOQuery(this.val2, this.pageNum + '', this.pageSize + '') + this.totalCount = res.size + if (res.size > 0) { const dataMap = res.data this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap) this.reload = false diff --git a/utils/getData2.js b/utils/getData2.js index 4dfd5e0..8b0c28f 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -28,16 +28,10 @@ export const handRequest = () => request({ * 空管入库 */ // 1.1生产区域下拉框查询 -// export const queryProductArea = () => request({ -// url:'api/pda/raw/queryProductArea', -// data: {} -// }) -export const queryProductArea = () => { - let res = { - data: [{value: '1', text: 'a'}] - } - return res -} +export const queryProductArea = () => request({ + url:'api/pda/raw/queryProductArea', + data: {} +}) // 1.2空纸管库设备物料初始化查询 export const queryMaterialInfo1 = (code, mcode, area, option) => request({ url:'api/pda/empty/queryMaterialInfo', @@ -190,19 +184,14 @@ export const conveyConfirm = (code) => request({ * 半成品入库 */ // 1.1半成品入库初始化查询 -// export const coolIOQuery = (name) => request({ -// url:'api/pda/coolIn/coolIOQuery', -// data: { -// container_name: name -// } -// }) -export const coolIOQuery = (name) => { - let res = { - data: [{status_name: '1'}, {status_name: '2'}, {status_name: '3'}, {status_name: '4'}, {status_name: '5'}], - total: 20 +export const coolIOQuery = (name, page, size) => request({ + url:'api/pda/coolIn/coolIOQuery', + data: { + container_name: name, + page: page, + size: size } - return res -} +}) // 1.2确认入库 export const confirmInstor = (raw_jo, code, is_bake) => request({ url:'api/pda/coolIn/confirmInstor',