0314

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

@@ -45,6 +45,7 @@
 			<button type="default" class="btn" @click="handleFinishReporting">结束报工</button>
 		</view>
 	</dialog-base>
+	<QrScanner v-if="showQrCodeReader" @decode="onDecodeHandler" @close="qrReaderClose" />
 </template>
 
 
@@ -53,6 +54,7 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
+	import QrScanner from '@/pages/vueQrCode/index.vue'
 	import {
 		onLoad
 	} from '@dcloudio/uni-app'
@@ -87,6 +89,7 @@
 
 	const baseDialog = ref(null)
 	const workInfo = ref({})
+	const showQrCodeReader = ref(false);
 	const wasteInfo = ref([])
 	const reasonList = ref([])
 	const emit = defineEmits(['resflushItem'])
@@ -283,70 +286,104 @@
 
 	function handleScanCode() {
 		// 引入原生插件
-		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		if (mpaasScanModule) {
-			//调用插件的 mpaasScan 方法
-			mpaasScanModule.mpaasScan({
-					// 扫码识别类型，参数可多选，qrCode、barCode，
-					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-					scanType: ["qrCode", "barCode"],
-					// 是否隐藏相册，默认false不隐藏
-					hideAlbum: false,
-				},
-				(ret) => {
-					let vehicleObj = {
-						carrierCode: ret.resp_result
-					};
-					let hasInFlag = false
-					for (let i = 0; i < bindList.value.length; i++) {
-						if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
-							hasInFlag = true
-							if (!bindList.value[i].flag) {
-								endFlag.value += 1;
-							}
-							bindList.value[i].flag = true;
-						}
-					}
-					if (!hasInFlag) {
-						uni.showToast({
-							icon: 'none',
-							title: '该批次没有绑定此箱',
-							duration: 2000
-						})
-					}
-					if (endFlag.value < bindList.value.length && hasInFlag) {
-						setTimeout(() => {
-							handleScanCode();
-						}, 700);
-					}
-				}
-			);
-		} else {
-			let vehicleObj = {
-				carrierCode: bindList.value[0].carrierCode
-			};
-			let hasInFlag = false
-			for (let i = 0; i < bindList.value.length; i++) {
-				if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
-					hasInFlag = true
-					if (!bindList.value[i].flag) {
-						endFlag.value += 1;
-					}
-					bindList.value[i].flag = true;
+		// const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		// if (mpaasScanModule) {
+		// 	//调用插件的 mpaasScan 方法
+		// 	mpaasScanModule.mpaasScan({
+		// 			// 扫码识别类型，参数可多选，qrCode、barCode，
+		// 			// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+		// 			scanType: ["qrCode", "barCode"],
+		// 			// 是否隐藏相册，默认false不隐藏
+		// 			hideAlbum: false,
+		// 		},
+		// 		(ret) => {
+		// 			let vehicleObj = {
+		// 				carrierCode: ret.resp_result
+		// 			};
+		// 			let hasInFlag = false
+		// 			for (let i = 0; i < bindList.value.length; i++) {
+		// 				if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
+		// 					hasInFlag = true
+		// 					if (!bindList.value[i].flag) {
+		// 						endFlag.value += 1;
+		// 					}
+		// 					bindList.value[i].flag = true;
+		// 				}
+		// 			}
+		// 			if (!hasInFlag) {
+		// 				uni.showToast({
+		// 					icon: 'none',
+		// 					title: '该批次没有绑定此箱',
+		// 					duration: 2000
+		// 				})
+		// 			}
+		// 			if (endFlag.value < bindList.value.length && hasInFlag) {
+		// 				setTimeout(() => {
+		// 					handleScanCode();
+		// 				}, 700);
+		// 			}
+		// 		}
+		// 	);
+		// } else {
+		// 	let vehicleObj = {
+		// 		carrierCode: bindList.value[0].carrierCode
+		// 	};
+		// 	let hasInFlag = false
+		// 	for (let i = 0; i < bindList.value.length; i++) {
+		// 		if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
+		// 			hasInFlag = true
+		// 			if (!bindList.value[i].flag) {
+		// 				endFlag.value += 1;
+		// 			}
+		// 			bindList.value[i].flag = true;
+		// 		}
+		// 	}
+		// 	if (!hasInFlag) {
+		// 		uni.showToast({
+		// 			icon: 'none',
+		// 			title: '该批次没有绑定此箱',
+		// 			duration: 2000
+		// 		})
+		// 	}
+		// 	if (endFlag.value < bindList.value.length && hasInFlag) {
+		// 		setTimeout(() => {
+		// 			handleScanCode();
+		// 		}, 700);
+		// 	}
+		// }
+		showQrCodeReader.value = true;
+	}
+
+	function qrReaderClose() {
+		showQrCodeReader.value = false;
+	}
+
+	function onDecodeHandler(ret) {
+		showQrCodeReader.value = false;
+		let vehicleObj = {
+			carrierCode: ret
+		};
+		let hasInFlag = false
+		for (let i = 0; i < bindList.value.length; i++) {
+			if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
+				hasInFlag = true
+				if (!bindList.value[i].flag) {
+					endFlag.value += 1;
 				}
+				bindList.value[i].flag = true;
 			}
-			if (!hasInFlag) {
-				uni.showToast({
-					icon: 'none',
-					title: '该批次没有绑定此箱',
-					duration: 2000
-				})
-			}
-			if (endFlag.value < bindList.value.length && hasInFlag) {
-				setTimeout(() => {
-					handleScanCode();
-				}, 700);
-			}
+		}
+		if (!hasInFlag) {
+			uni.showToast({
+				icon: 'none',
+				title: '该批次没有绑定此箱',
+				duration: 2000
+			})
+		}
+		if (endFlag.value < bindList.value.length && hasInFlag) {
+			setTimeout(() => {
+				handleScanCode();
+			}, 700);
 		}
 	}
 

manifest.json

@@ -2,8 +2,8 @@
 	"name": "(测试)德迈仕数字生产管理平台",
 	"appid": "__UNI__54D8B02",
 	"description": "",
-	"versionName": "1.0.48",
-	"versionCode": 48,
+	"versionName": "1.0.50",
+	"versionCode": 50,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

pages/batchReporting/index.vue

@@ -260,8 +260,7 @@
 			requisitionDepartmentId: store.curDeptDetails.deptId
 		}).then(res => {
 			wasteRecyclingList.value = res.rows
-			if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId ||
-				wasteRecyclingList.value.length > 0) {
+			if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId) {
 				bottomStatus.value = true;
 				store.isPreProcess = true;
 			} else {

pages/queryLotInfo/index.vue

@@ -460,22 +460,22 @@
 		// 获取 tab2 的【SelectorQuery】，一定要在页面加载完之后，获取该对象，不要在【滚动】事件中获取，
 		// 那会创建很多个【SelectorQuery】，导致效率低下
 		item2Query = query.select("#item2").boundingClientRect((data) => {
-			if (data.top >= 32 && data.top <= 80) {
+			if (data.top >= 32 && data.top <= 40) {
 				isActiveId.value = 2
 			}
 		})
 		item3Query = query.select("#item3").boundingClientRect((data) => {
-			if (data.top >= 32 && data.top <= 80) {
+			if (data.top >= 32 && data.top <= 40) {
 				isActiveId.value = 3
 			}
 		})
 		item4Query = query.select("#item4").boundingClientRect((data) => {
-			if (data.top >= 32 && data.top <= 80) {
+			if (data.top >= 32 && data.top <= 40) {
 				isActiveId.value = 4
 			}
 		})
 		item5Query = query.select("#item5").boundingClientRect((data) => {
-			if (data.top >= 32 && data.top <= 80) {
+			if (data.top >= 32 && data.top <= 40) {
 				isActiveId.value = 5
 			}
 		})

pages/sortBatchReporting/index.vue

@@ -51,7 +51,8 @@
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">原材料厂家</text>
-					<text class="label right">{{ item['furnaceNoInfo'] ? item['furnaceNoInfo'].factory : '-' }}</text>
+					<text
+						class="label right">{{ item['furnaceNoInfo'] ? (item['furnaceNoInfo'].factory === "" ? "-" : item['furnaceNoInfo'].factory) : "-" }}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">箱号</text>
@@ -134,6 +135,8 @@
 			<button class="start-batch-btn" type="primary" @click="handleScanCode">扫一扫开始新批次</button>
 		</view> -->
 		<view class="bottom uni-row">
+			<button v-if="bottomStatus" class="start-batch-btn" style="margin-right: 10rpx;" type="primary"
+				@click="handleStartNewBatch">开始新批次</button>
 			<button class="start-batch-btn" style="margin-right: 10rpx;" type="primary"
 				@click="handleScanCode">扫码开始批次</button>
 			<button class="start-batch-btn" type="primary" @click="handleSearchCode">查箱号</button>
@@ -240,8 +243,7 @@
 		}).then(res => {
 			wasteRecyclingList.value = res.rows
 			console.log(wasteRecyclingList.value.length)
-			if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId ||
-				wasteRecyclingList.value.length > 0) {
+			if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId) {
 				bottomStatus.value = true;
 				store.isPreProcess = true;
 			} else {

pages/sorting/form.vue

@@ -9,7 +9,7 @@
 				产品描述: {{ dayworkItem.productDescription }}
 			</view>
 			<view class="product-info">
-				原材料厂家: {{ dayworkInfo.furnaceNoInfo.factory }}
+				原材料厂家: {{ dayworkInfo.furnaceNoInfo.factory == "" ? "-":dayworkInfo.furnaceNoInfo.factory }}
 			</view>
 			<view class="product-info">
 				投产数量: {{ dayworkItem.prodNum }}