1.18

components/dialog-receipt/dialog-receipt.vue

@@ -112,8 +112,15 @@
 
 
 	function handleConfirm() {
-		emit('submit',placement.value);
-		close();
+		if(placement.value){
+			emit('submit',placement.value);
+			close();
+		}else{
+			uni.showToast({
+				icon: 'none',
+				title: '请选择摆放位置'
+			})
+		}
 	}
 
 	// function handleChange() {

pages/recerptSfprod/index.vue

@@ -80,6 +80,13 @@
 					status: 6
 				}).then(response => {
 					console.log(response)
+					if(response.data.length == 0){
+						uni.showToast({
+							icon: 'none',
+							title: '该批次已被领取'
+						})
+						return;
+					}
 					// for (let i = 0; i < products.value.length; i++) {
 					// 	if (products.value[i].lotCode === res.data[0].lotCode) {
 					// 		console.log(products.value[i].lotCode);
@@ -111,7 +118,7 @@
 	}
 
 	function handleConfirmReceipt() {
-		// receipt.value.open();
+		receipt.value.open();
 		if (selection.value.length > 0) {
 			receipt.value.open();
 		}

pages/reportingForWork/index.vue

@@ -31,7 +31,7 @@
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">结束时间</text>
-					<text class="label right">{{ (item['endTime'] !="")?item['endTime']:'-'}}</text>
+					<text class="label right">{{ item['endTime'] ? item['endTime'] : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">废品数</text>