11.7

pages/processInspectionReceive/form.vue

@@ -442,7 +442,7 @@
 
 		</view>
 		<!-- 外协检 -->
-		<view v-if="isActived.label == '外协检' " style="margin-bottom: 130rpx;margin-top: 16rpx;">
+		<view v-if="isActived.label == '外协检查' " style="margin-bottom: 130rpx;margin-top: 16rpx;">
 			<view class="carrier-info uni-column">
 				<view class="carrier-code uni-row">
 					<text>箱号</text>

pages/sortProductionPlan/details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-column" style="padding: 24rpx">
+	<view class="page-container uni-column" style="padding: 24rpx;box-sizing: border-box;">
 		<view class="box-bg uni-row">
 			<view class="input-view uni-row">
 				<uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
@@ -10,7 +10,7 @@
 		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
 			<text>暂无周转到该工段批次</text>
 		</view>
-		<view v-else style="height: calc(100% - 100rpx); overflow: auto;">
+		<view class="uni-column" v-else >
 			<view v-for="(item, index) in listData" :key="index"
 				class="list-item">
 				<view class="title-container uni-row">
@@ -72,7 +72,9 @@
 		console.log(status.value)
 		if(status.value) {
 		pageNum.value += 1
-
+uni.showLoading({
+			title: '加载中'
+		});
 		getCarrierTotalList({
 			deptId: Number(store.curDeptDetails.deptId),
 			keywords: keywords.value,
@@ -84,16 +86,19 @@
 		
 		  // 过滤出那些不在 existingIds 中的项，即新数据
 		  const newRows = res.data.filter(row => !existingIds.has(row.lotCode));
-		
+		console.log(newRows)
 		  // 如果有新数据，将其添加到 listData
 		  if (newRows.length > 0) {
 		    listData.value = listData.value.concat(newRows);
+			uni.hideLoading();
 		  } else {
+			  uni.hideLoading();
 		    // 如果没有新数据，更新状态表示没有更多数据
 		    status.value = false;
 		  }
 		})
 		}
+		console.log(status.value)
 	})
 
 	function init(data) {
@@ -169,9 +174,9 @@
 		}
 	}
 
-	.uni-column {
+	.page-container {
 		background-color: rgba(245, 245, 245, 1);
-		height: calc(100% - 40rpx);
+		// height: calc(100% - 40rpx);
 	}
 
 	.list-item {