重庆bug修改

pages/fetchExam/fetchExam.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
-		<view 
+		<view
 			class="single-fetch"
 			v-for="(fetch, index) in fetchMaterialList"
 			:key="index"
 		>
 			<view class="fetch-upper">
-				<!-- <checkbox-group 
-					v-show="fetch.taskStatus != '35'" 
+				<!-- <checkbox-group
+					v-show="fetch.taskStatus != '35'"
 					style="margin-right: 15rpx;"
 					@change="checkClick(fetch)"
 				>
@@ -48,7 +48,7 @@
 				</view>
 			</view>
 			<view class="fetch-btns">
-				<view 
+				<view
 					style="background-color: #3788FF;"
 					@click="seeDetail(fetch.taskId)"
 					v-show="fetch.taskStatus != '35'"
@@ -80,7 +80,7 @@
 					<uni-icons style="color: #fff;" type="auth"></uni-icons>
 					机具分公司确认
 				</view>
-				<!-- <view 
+				<!-- <view
 					style="background-color: #FCA30D;"
 					v-show="fetch.taskStatus == 30 && roles.includes('fgs')"
 					@click="toggleOpenModal(fetch)"
@@ -183,7 +183,7 @@
 				</checkbox-group>
 				<text>全选</text>
 			</view>
-			<view 
+			<view
 				class="exam"
 				@click="toggleExam"
 			>
@@ -191,16 +191,16 @@
 			</view>
 		</view> -->
 		<uni-popup
-			ref="popup" 
+			ref="popup"
 			type="center"
 			:mask-click="false"
 		>
 			<view class="popup">
 				<view class="pop-top">
 					<h4>审批</h4>
-					<uni-icons 
-						style="color: #AAAAAA; font-weight: bold;" 
-						type="closeempty" 
+					<uni-icons
+						style="color: #AAAAAA; font-weight: bold;"
+						type="closeempty"
 						@click="closePopup"
 					>
 					</uni-icons>
@@ -227,16 +227,16 @@
 			</view>
 		</uni-popup>
 		<uni-popup
-			ref="popup1" 
+			ref="popup1"
 			type="center"
 			:mask-click="false"
 		>
 			<view class="popup1">
 				<view class="pop-top">
 					<h4>驳回原因</h4>
-					<uni-icons 
-						style="color: #AAAAAA; font-weight: bold;" 
-						type="closeempty" 
+					<uni-icons
+						style="color: #AAAAAA; font-weight: bold;"
+						type="closeempty"
 						@click="closePopup1"
 					>
 					</uni-icons>
@@ -256,6 +256,9 @@ import { basePath } from '../../public'
 	export default {
 		data() {
 			return {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
 				showLoading: false,
 				allChecked: false,
 				examFormData: {
@@ -277,7 +280,7 @@ import { basePath } from '../../public'
 					}
 				},
 				fetchMaterialList: [
-					
+
 				],
 				examList: [],
 				deviceList: [],
@@ -417,7 +420,7 @@ import { basePath } from '../../public'
 						break;
 				}
 				that.modalList.leaseApplyInfoList[0].examineStatusId = that.examList.taskStatus
-				// if (that.modalList.taskStatus == 32) that.modalList.taskStatus = 100 
+				// if (that.modalList.taskStatus == 32) that.modalList.taskStatus = 100
 				/* for (let i = 0; i < that.modalList.leaseApplyInfoList.length; i++) {
 					that.modalList.leaseApplyInfoList[i].companyAuditBy = uni.getStorageSync('userInfo').userid
 					that.modalList.leaseApplyInfoList[i].deptAuditBy = uni.getStorageSync('userInfo').userid
@@ -592,18 +595,21 @@ import { basePath } from '../../public'
 				let that = this
 				that.showLoading = true
 				that.$api.fetchExam.fetchTrueExamListCq({
-					souceBy: 1
+					souceBy: 0,
+          pageNum: that.pageNum,
+          pageSize: that.pageSize
 				}).then(res => {
 					console.log(res);
 					if (res.data.code == 200) {
-						if (res.data.data.length == 0) {
+            that.pageTotal = res.data.data.total
+						if (res.data.data.rows.length == 0) {
 							that.showLoading = false
 							uni.showToast({
 								icon: 'none',
 								title: '未查询到相关数据！'
 							})
 						} else {
-							that.fetchMaterialList = res.data.data.rows
+							that.fetchMaterialList = [...that.fetchMaterialList, ...res.data.data.rows]
 							that.showLoading = false
 							console.log(that.fetchMaterialList);
 						}
@@ -644,7 +650,13 @@ import { basePath } from '../../public'
 			}
 			if (that.roles.includes('admin')) that.roles = ['admin', 'fgs', 'sgb', 'ajb', 'jjfgs', 'tsfgs']
 			that.initFetch()
-		}
+		},
+    onReachBottom() {
+		console.log(this.fetchMaterialList, this.pageTotal);
+      if (this.fetchMaterialList.length >= this.pageTotal) return;
+      this.pageNum++
+      this.initFetch()
+    },
 	}
 </script>
 
@@ -753,7 +765,7 @@ import { basePath } from '../../public'
 				font-size: 14px;
 				font-weight: normal;
 				background-color: #fff;
-				border: 1px solid #3788FF; 
+				border: 1px solid #3788FF;
 				color: #3788FF;
 			}
 		}