分页

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)
+				let res = await coolIOQuery(this.val2, this.pageNum + '', this.pageSize + '')
-				// this.dataList = [...res.data]
+				this.totalCount = res.size
-				this.totalCount = res.total
+				if (res.size > 0) {
-				if (res.total > 0) {
 					const dataMap = res.data
 					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
 					this.reload = false

utils/getData2.js

@@ -28,16 +28,10 @@ export const handRequest = () => request({
  * 空管入库
  */
 // 1.1生产区域下拉框查询
-// export const queryProductArea = () => request({
+export const queryProductArea = () => request({
-// 	url:'api/pda/raw/queryProductArea',
+	url:'api/pda/raw/queryProductArea',
-// 	data: {}
+	data: {}
-// })
+})
-export const queryProductArea = () => {
-	let res = {
-		data: [{value: '1', text: 'a'}]
-	}
-	return res
-}
 // 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({
+export const coolIOQuery = (name, page, size) => request({
-// 	url:'api/pda/coolIn/coolIOQuery',
+	url:'api/pda/coolIn/coolIOQuery',
-// 	data: {
+	data: {
-// 		container_name: name
+		container_name: name,
-// 	}
+		page: page,
-// })
+		size: size
-export const coolIOQuery = (name) => {
-	let res = {
-		data: [{status_name: '1'}, {status_name: '2'}, {status_name: '3'}, {status_name: '4'}, {status_name: '5'}],
-		total: 20
 	}
-	return res
+})
-}
 // 1.2确认入库
 export const confirmInstor = (raw_jo, code, is_bake) => request({
 	url:'api/pda/coolIn/confirmInstor',