提交

pages/outsourcedInspection/form.vue

@@ -39,7 +39,7 @@
 
 		<!-- 废品信息 -->
 		<view class="title unfit-title uni-row">
-			<text>废品信息</text>
+			<text>检查信息</text>
 			<view v-if="editable()" class="add-btn" @click="handleAddWaste">添加</view>
 		</view>
 		<view class="unfit-container">
@@ -124,7 +124,7 @@
 			</view> -->
 			<view class="result resu uni-row" style="margin-top: 20rpx; margin-right: 10rpx;">
 				<view class="label">序检状态</view>
-				<uni-data-checkbox v-if="editable()" style="margin-top: 20rpx;" v-model="processInspecion.status"
+				<uni-data-checkbox v-if="editable()" style="margin-left: 10px;" v-model="processInspecion.status"
 					:localdata="range" @change="change"></uni-data-checkbox>
 				<view v-else class="value" style="margin-left: 10px;">{{ processInspecion.status == 1 ? '合格' : '不合格' }}
 				</view>
@@ -321,9 +321,23 @@
 				})
 				return;
 			}
+			if (unf[i].rejectNum < 0 || unf[i].examiningNum < 0 || unf[i].disqualificationNum < 0) {
+				uni.showToast({
+					icon: 'none',
+					title: '检查量，不良品量，废品量不能小于0',
+					duration: 2000
+				})
+				return
+			}
+			if (unf[i].examiningNum > processInspecion.value.lot.pudName) {
+				uni.showToast({
+					icon: 'none',
+					title: '检查量不能大于投产量'
+				})
+				return
+			}
 		}
 
-		let sumReject = 0
 		unfitInfos.value.forEach(v => {
 			sumReject += Number(v.rejectNum)
 		})
@@ -335,6 +349,13 @@
 			})
 			return;
 		}
+		if (processInspecion.value.rejectNum > processInspecion.value.lot.pudName) {
+			uni.showToast({
+				icon: 'none',
+				title: '废品量不能大于投产量'
+			})
+			return
+		}
 
 		save();
 

pages/outsourcedInspection/index.vue

@@ -291,7 +291,7 @@
 		if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:remove')) {
 			return true
 		}
-		if (item.creatorId === userId && item.status == 0) {
+		if (item.creatorId === userId.value && item.status == 0) {
 			return true
 		}
 		return false
@@ -336,7 +336,7 @@
 	}
 
 	.page-container {
-		height: 100%;
+		// height: 100%;
 		background-color: #ececec;
 		font-size: 28rpx;
 		padding: 24rpx;