生箔工序

pages/ProductManage/SboProcess.vue

@@ -59,13 +59,14 @@
 					</table>
 				</view>
 			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫空轴</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">确认下卷</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="_finishBlanking">下卷完成</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button>
-			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
+			<button class="submit-button" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
@@ -89,20 +90,57 @@
 				disabled1: false,
 				disabled2: false,
 				disabled3: false,
-				disabled4: false
+				disabled4: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
 		},
 		created () {
 			this._queryRawFoilList()
 		},
 		methods: {
+			searchList () {
+				this.dataList = []
+				this._queryRawFoilList()
+			},
 			handleChange (e) {
 				// console.log(e)
 			},
 			/** 初始化查询 */
 			async _queryRawFoilList () {
-				let res = await queryRawFoilList(this.val1, this.val2)
+				let res = await queryRawFoilList(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
-				this.dataList = [...res.data]	
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+				
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._queryRawFoilList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
 			},
 			async _needEmptyAxis () {
 				this.disabled1 = true

utils/getData1.js

@@ -25,11 +25,13 @@ export const queryRawFoil = (pcode, cname, parea, page, size) => request({
  * 生箔工序
  */
 // 1.1生箔工序初始化查询
-export const queryRawFoilList = (pcode, cname) => request({
+export const queryRawFoilList = (pcode, cname, page, size) => request({
 	url: 'api/pda/raw/queryRawFoilList',
 	data: {
 		point_code: pcode,
-		container_name: cname
+		container_name: cname,
+		page: page,
+		size: size
 	}
 })
 // 1.2呼叫空轴