0402

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

@@ -118,7 +118,7 @@
 						specialDeptProcessList.value[i] = res.data[i].processId;
 					}
 					for (let i = 0; i < response.rows.length; i++) {
-						if (response.rows[i].processId == workInfo.value.processId) { 
+						if (response.rows[i].processId == workInfo.value.processId) {
 							lotPreSumReject.value += response.rows[i].rejectSum;
 							lotPreSumQualifiedNum.value += response.rows[i].qualifiedNum;
 						}
@@ -128,8 +128,9 @@
 					workInfo.value.qualifiedNum = store.dayworkInfo.processQualifiedNum > 0 ?
 						Math.max(0, store.dayworkInfo.processQualifiedNum - lotPreSumQualifiedNum.value -
 							lotPreSumReject.value) :
-					    store.dayworkInfo.isLast == 1 ? Math.max(0, store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject
-							.value)	:	
+						store.dayworkInfo.isLast == 1 ? Math.max(0, store.dayworkInfo.lastLotQuantity -
+							lotPreSumQualifiedNum.value - lotPreSumReject
+							.value) :
 						Math.max(0, store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject
 							.value);
 					// temp.value = workInfo.value.qualifiedNum;
@@ -243,11 +244,12 @@
 				.oneLotQuantity > 0)) {
 			uni.showModal({
 				title: '提示',
-				content: `合格数总量超出投入量${Math.round((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity) * 100}%，是否继续保存?`,
+				// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
+				content: `合格数总量超出投入量${((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity).toFixed(3) * 100}%，是否继续保存?`,
 				success: function(res) {
 					if (res.confirm) {
 						handleSave();
-					} else if (res.cancel) {} 
+					} else if (res.cancel) {}
 				}
 			})
 		} else {
@@ -260,7 +262,8 @@
 				.oneLotQuantity > 0)) {
 			uni.showModal({
 				title: '提示',
-				content: `合格数总量超出投入量${Math.round((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity) * 100}%，是否继续保存?`,
+				// content: `合格数总量超出投入量${parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity}，是否继续保存?`,
+				content: `合格数总量超出投入量${((parseInt(workInfo.value.qualifiedNum)  + lotPreSumQualifiedNum.value - store.dayworkInfo.oneLotQuantity) / store.dayworkInfo.oneLotQuantity).toFixed(3) * 100}%，是否继续保存?`,
 				success: function(res) {
 					if (res.confirm) {
 						if (showCarrierList.value) {
@@ -331,7 +334,6 @@
 			})
 			return;
 		}
-		close();
 		if (workInfo.value.status != '3') {
 			workInfo.value.status = '2';
 		}
@@ -347,7 +349,7 @@
 					title: '操作成功',
 				});
 				emit('resflushItem');
-				baseDialog.value.close();
+				close();
 			} else {
 				uni.showToast({
 					icon: 'none',
@@ -376,10 +378,14 @@
 					.processQualifiedNum - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value
 					.qualifiedNum > 0 ? store.dayworkInfo
 					.processQualifiedNum - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value
-					.qualifiedNum : 1 : store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value -
-					lotPreSumReject.value - workInfo.value.qualifiedNum > 0 ? store.dayworkInfo.oneLotQuantity -
-					lotPreSumQualifiedNum.value -
-					lotPreSumReject.value - workInfo.value.qualifiedNum : 1,
+					.qualifiedNum : 1 
+					: 
+					store.dayworkInfo.isLast == 1 ? 
+						store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum > 0
+						? store.dayworkInfo.lastLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum : 1
+							:
+						store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum > 0 
+						? store.dayworkInfo.oneLotQuantity - lotPreSumQualifiedNum.value - lotPreSumReject.value - workInfo.value.qualifiedNum : 1,
 				reason: ''
 			})
 		}