css

components/dialog-end-work/dialog-end-work.vue

@@ -134,7 +134,8 @@
 					workInfo.value.qualifiedNum = store.dayworkInfo.processQualifiedNum > 0 ?
 						Math.max(0, store.dayworkInfo.processQualifiedNum - lotPreSumQualifiedNum.value -
 							lotPreSumReject.value) :
-						Math.max(0, store.dayworkInfo.productionQuantity - lotPreSumQualifiedNum.value - lotPreSumReject
+						Math.max(0, store.dayworkInfo.productionQuantity - lotPreSumQualifiedNum.value -
+							lotPreSumReject
 							.value);
 					// temp.value = workInfo.value.qualifiedNum;
 				} else {
@@ -267,6 +268,7 @@
 		workInfo.value.prodNum = number
 		console.log("合格量", (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value))
 		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+		percent = Math.ceil(percent * 100) / 100;
 		console.log("percent", lotPreSumQualifiedNum.value);
 		let num = 103;
 		// 填入数大于剩余量情况
@@ -274,7 +276,6 @@
 			// 判断当前是否为首序
 			if (isFirstOrder.value) {
 				percent = ((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - number) / number) * 100;
-				percent = Math.ceil(percent * 100) / 100;
 				uni.showModal({
 					title: '提示',
 
@@ -335,6 +336,7 @@
 					}
 				})
 			} else {
+				percent = Math.ceil(percent * 100) / 100;
 				if (percent > num) {
 					uni.showToast({
 						icon: 'none',

pages/batchReporting/index.vue

@@ -20,7 +20,7 @@
 			<switch class="switch" @change="switchChange" color="rgba(255,85,85,1)" />
 			<text>否</text> -->
 		</view>
-		<view class="scroll-container">
+		<view class="scroll-container" style="padding-bottom:  150rpx">
 			<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
 				<text>暂无批次</text>
 			</view>
@@ -343,7 +343,6 @@
 			listData.value = tempList.value.filter(item => {
 				return item.isWasteRecycling == 1 || item.isAmend == 1;
 			});
-			console.log("批次信息", listData.value)
 			normalStatus.value = false
 		} else {
 			listData.value = tempList.value.filter(item => {