1222

components/dialog-login/dialog-login.vue

@@ -74,7 +74,10 @@
 				loginRequest(URL.value);	
 			},
 			fail: function() {
-				loginRequest(URL.value)
+				loginRequest(URL.value);
+				setTimeout(function() {
+					uni.hideLoading();
+				}, 3000)
 			}
 		});
 	}

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -63,6 +63,7 @@
 	const curDayworkItem = ref({})
 	const dayworkInfo = ref(null)
 	const deptList = ref([]) // 工段列表
+	const emit = defineEmits('confirm')    // 自定义调用父组件方法
 
 	onLoad(() => {
 
@@ -174,6 +175,7 @@
 				}
 			})
 		}
+		emit('confirm');
 	}
 
 	function handleChange() {

pages/batchReporting/index.vue

@@ -69,7 +69,7 @@
 				@click="handleScanCode">扫一扫开始新批次</button>
 		</view>
 		<dialog-lot ref="lotDialog" @submit="handleDoIt" />
-		<dialog-turnoverApplication ref="turnoverApplicationDialog" />
+		<dialog-turnoverApplication ref="turnoverApplicationDialog" @confirm="handleDoTurnoverAfter"/>
 	</view>
 
 </template>
@@ -234,6 +234,10 @@
 	function handleDoIt() {
 		handleAddDaywork(reqParam.value);
 	}
+	
+	function handleDoTurnover(){
+		init();
+	}
 </script>
 
 <style lang="scss">

pages/equipmentList/index.vue

@@ -61,6 +61,7 @@
 				for (var i = 0; i < curBindDetails.value.length; i++) {
 					curBindEquipmentIds.value.push(curBindDetails.value[i].equipmentDetailId)
 				}
+				console.log(curBindEquipmentIds.value)
 			})
 		})
 	}
@@ -106,6 +107,7 @@
 			scanType: ['qrCode'], // 条形码扫描
 			onlyFromCamera: true, // 只允许相机扫码
 			success: function(res) {
+				console.log(res.result)
 				let equipment = JSON.parse(res.result);
 				for (let i = 0; i < equipmentList.value.length; i++) {
 					// 判断是否已经扫码
@@ -117,6 +119,7 @@
 						return;
 					}
 				}
+				
 				// 设置绑定员工的信息
 				userEquipmentData.value = {
 					...JSON.parse(res.result), 
@@ -124,8 +127,8 @@
 					nickName: userInfo.value.nickName
 				}
 				// 判断该设备是否分配给改员工
-				if (!curBindEquipmentIds.value.includes(equipment.equipmentId)) {
-					console.log(equipment.equipmentId)
+				if (!curBindEquipmentIds.value.includes(equipment.equipmentDetailId)) {
+					console.log(equipment.equipmentDetailId)
 					let msg = '当前员工没有分配到该设备,确定继续绑定吗?';		 
 					confirm.value.open(msg);
 				}else{