From a39127a80480f652ad1bc472dcd5c2336b08f175 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Jun 2025 15:25:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B4=A8=E6=A3=80=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index ffdf8e73..d466f1fd 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -78,7 +78,7 @@
 				show-summary
 				
 			>
-				<el-table-column label="批次号" class-name="colorheader1" prop="batch" min-width="240" fixed="left">
+				<el-table-column label="批次号" prop="batch" min-width="240" fixed="left">
 					<template  #default="scope"><span>{{ scope.row.data.批次号 }}</span></template>
 				</el-table-column>
 				<el-table-column label="尺寸检验" align="center" class-name="colorheader1">
@@ -299,8 +299,8 @@
 				</el-table-column>
 				<el-table-column label="外观总合格数" class-name="colorheader4">
 					<template  #default="scope">
-						<span v-if="scope.row.data.外观检验_完全总合格数">{{ scope.row.data.外观检验_完全总合格数 }}</span>
-						<span v-else>0</span>
+						<span v-if="scope.row.data.外观检验_完全总合格数==0&&scope.row.data.外观检验_count_ok_full">{{ scope.row.data.外观检验_count_ok_full }}</span>
+						<span v-else>{{ scope.row.data.外观检验_完全总合格数 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="外观总合格率(%)" class-name="colorheader4">
@@ -606,14 +606,24 @@ export default {
 						sums[index] = ((sums[index-1]/sums[25])*100).toFixed(4);
 					}
 				}
+				if(index==71){
+					let sum = 0;
+					if(sums[26]){
+						sum += sums[26];
+					}
+					if(sums[55]){
+						sum += sums[55];
+					}
+					sums[index] = sum;
+				}
 				if(index==72){
 					if(sums[71]&&sums[25]){
-						sums[index] = ((sums[71]/sums[25])*100).toFixed(4);
+						sums[index] = ((sums[71]/sums[25])*100).toFixed(2);
 					}
 				}
 				if(index==73){
 					if(sums[72]&&sums[22]){
-						sums[index] = ((sums[72]/sums[22])*100).toFixed(4);
+						sums[index] = ((sums[72]*sums[22])/100).toFixed(2);
 					}
 				}
 			});