查找

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

@@ -264,17 +264,21 @@
 	function handlePreFinishReporting() {
 
 		//投产数
-		let number = workInfo.value.prodNum;
+		let number = store.dayworkInfo.processQualifiedNum == 0 ? store.dayworkInfo.productionQuantity : store.dayworkInfo
+			.processQualifiedNum;
 		console.log("总数", number);
 		console.log("合格量", (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value))
 		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+		console.log("percent", lotPreSumQualifiedNum.value);
 		let num = 103;
 		// 填入数大于剩余量情况
 		if (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - number > 0) {
 			// 判断当前是否为首序
 			if (isFirstOrder.value) {
 				percent = ((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - number) / number) * 100;
+				console.log("percen55555555555t", percent);
 				percent = Math.ceil(percent * 100) / 100;
+				console.log("percen555t", percent);
 				uni.showModal({
 					title: '提示',
 
@@ -402,7 +406,7 @@
 		workInfo.value.endTime = timestampToTime(new Date());
 		workInfo.value.rejectList = wasteInfo.value;
 		workInfo.value.isPreProcess = store.isPreProcess;
-	    workInfo.value.processStepNumber = store.dayworkInfo.currentProcess.processStepNumber
+		workInfo.value.processStepNumber = store.dayworkInfo.currentProcess.processStepNumber
 		saveDayWorkItem(workInfo.value).then(res => {
 			if (res.code === 200) {
 				uni.showToast({

pages/reportingForWork/index.vue

@@ -148,9 +148,10 @@
 		});
 		getDayWorkItemList({
 			dayworkId: dayWorkInfo.value.id,
-			lotId:dayWorkInfo.value.lotId,
-			isWasteRecycling:dayWorkInfo.value.isWasteRecycling,
-			processStepNumber:dayWorkInfo.value.currentProcess.processStepNumber,
+			lotId: dayWorkInfo.value.lotId,
+			isWasteRecycling: dayWorkInfo.value.isWasteRecycling,
+			isAmend: dayWorkInfo.value.isAmend,
+			processStepNumber: dayWorkInfo.value.currentProcess.processStepNumber,
 			// processId: store.dayworkInfo.currentProcess.id,
 			type: '非周转中item'
 		}).then(res => {