css

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

@@ -261,21 +261,26 @@
 	}
 
 	function handlePreFinishReporting() {
-		console.log("44")
 		//投产数
 		let number = store.dayworkInfo.processQualifiedNum == 0 ? store.dayworkInfo.productionQuantity : store.dayworkInfo
 			.processQualifiedNum;
 		workInfo.value.prodNum = number
-		console.log("合格量", (parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value))
-		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
-		percent = Math.ceil(percent * 100) / 100;
-		console.log("percent", lotPreSumQualifiedNum.value);
+
+		let max = parseInt(number * 1.03);
+		// max = parseInt(String(max).split("."));
+		console.log("maxawdjkkaljdalkw", max);
+		let sunm = parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value; //计算总合格数
+		let percent = (sunm / number) * 100; //合格率
+
+		percent = Math.ceil(percent * 100) / 100; //只入不舍
+		console.log("合格量", percent)
+		// let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+
 		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;
 				uni.showModal({
 					title: '提示',
 
@@ -306,15 +311,16 @@
 		console.log(store.isPreProcess)
 		//投产数
 		let number = workInfo.value.prodNum;
-		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(2);
+		let percent = (((parseInt(workInfo.value.qualifiedNum) + lotPreSumQualifiedNum.value) / number) * 100).toFixed(
+			2);
 		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;
-				percent = Math.ceil(percent * 100) / 100;
+				if (percent == 103) {
+					percent = 103.1
+				}
 				uni.showModal({
 					title: '提示',
-
 					content: `合格数总量超出投入量${percent}%，是否继续保存?`,
 					success: function(res) {
 						if (res.confirm) {
@@ -336,7 +342,9 @@
 					}
 				})
 			} else {
-				percent = Math.ceil(percent * 100) / 100;
+				if (percent == num) {
+					percent = 103.01
+				}
 				if (percent > num) {
 					uni.showToast({
 						icon: 'none',

pages/dashboard/index.vue

@@ -101,7 +101,7 @@
 		} else if (store.userInfo.roles.some(item => item.roleId == 124) && store.userInfo.roles.length == 1) {
 			showTurn.value = true;
 			showOther.value = false;
-		} else if (store.userInfo.roles.some(item => item.roleId == 128) && store.userInfo.roles.length == 1) {
+		} else if (store.userInfo.roles.some(item => item.roleId == 128)) {
 			showInspector.value = true
 			showOther.value = true;
 		} else {