0115

components/dialog-receipt/dialog-receipt.vue

@@ -59,7 +59,7 @@
 	const curDayworkItem = ref({
 		turnoverType: 1
 	})
-	const dayworkInfo = ref(null)
+	const receiveInfo = ref(null)
 	const deptList = ref([]) // 工段列表
 	const turnAreaList = ref([]) // 周转区列表
 	// const emit = defineEmits('confirm') // 自定义调用父组件方法
@@ -71,7 +71,7 @@
 	function open(data) {
 		deptList.value = [];
 		turnAreaList.value = [];
-		dayworkInfo.value = data;
+		receiveInfo.value = data;
 		baseDialog.value.open();
 		init();
 	}

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -74,7 +74,7 @@
 	const sendReqParam = ref({})
 	const processList = ref([])
 	const selectedProcess = ref(null)
-	const selectedEquipment = ref(null)
+	const selectedEquipment = ref({})
 	const flag = ref(false)
 	const userName = ref(null)
 
@@ -121,11 +121,11 @@
 								value: equipmentList.value[i]
 							}
 						};
-						selectedEquipment.value = equipmentList.value[0];
+						selectedEquipment.value = equipmentList.value[0].value;
 						console.log(selectedEquipment.value)
+						
 					}
 				})
-				selectedEquipment.value = equipmentList.value[0];
 			}
 		})
 		// let reqParam = {
@@ -154,6 +154,7 @@
 		// 		})
 		// 	}
 		// })
+		
 		baseDialog.value.open()
 	}
 
@@ -175,7 +176,7 @@
 	}
 
 	function handleEquipmentChange() {
-
+		console.log(selectedEquipment.value)
 	}
 
 	function switchChange(e) {

pages/recerptSfprod/index.vue

@@ -53,11 +53,9 @@
 	const flag = ref(false)
 	const selection = ref([])
 
-	onLoad(() => {
-	})
+	onLoad(() => {})
 
-	function init() {
-	}
+	function init() {}
 
 	function handleScanCode() {
 		uni.scanCode({
@@ -111,11 +109,8 @@
 	}
 
 	function handleConfirmReceipt() {
-		let msg = "是否确认接收";
-		receipt.value.open(msg);
-		if (selection.value.length > 0) {
-			let msg = "是否确认接收";
-			confirm.value.open(msg);
+		if (selection.value.length > 0) {		
+			receipt.value.open(selection.value);
 		}
 	}