From d47bf5fc49242fe561a1f95f8882598f01c3ae45 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 29 Apr 2026 15:25:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=93378=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B8=AD=EF=BC=8C=E6=8A=BD=E6=A3=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=9A=84=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 58 +++++++++++++++-----------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index e109fd5f..9a5c1e0a 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -206,7 +206,7 @@
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_缺陷_划麻(返修)_比例'] }}</span></template>
 					</el-table-column>
 					<el-table-column label="脏(返修)" class-name="colorheader2">
-						<template  #default="scope"><span>{{ scope.row.data['外观检验_缺陷_脏(返修) ']}}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_缺陷_脏(返修)']}}</span></template>
 					</el-table-column>
 					<el-table-column label="比例(%)" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_缺陷_脏(返修)_比例'] }}</span></template>
@@ -268,8 +268,8 @@
 					<el-table-column label="发白" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_发白 }}</span></template>
 					</el-table-column>
-					<el-table-column label="裂" class-name="colorheader2">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_裂 }}</span></template>
+					<el-table-column label="裂纹" class-name="colorheader2">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_裂纹 }}</span></template>
 					</el-table-column>
 					<el-table-column label="光圈" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_光圈 }}</span></template>
@@ -336,8 +336,8 @@
 					<el-table-column label="发白" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_发白 }}</span></template>
 					</el-table-column>
-					<el-table-column label="裂" class-name="colorheader3">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_裂 }}</span></template>
+					<el-table-column label="裂纹" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_裂纹 }}</span></template>
 					</el-table-column>
 					<el-table-column label="光圈" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_光圈 }}</span></template>
@@ -369,31 +369,31 @@
 				</el-table-column>
 				<el-table-column label="抽检" align="center" class-name="colorheader7">
 					<el-table-column label="日期" class-name="colorheader7" width="90">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_日期 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_日期 }}</span></template>
 					</el-table-column>
 					<el-table-column label="黑圈变形" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈变形 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_缺陷_黑圈变形 }}</span></template>
 					</el-table-column>
 					<el-table-column label="黑圈缺口" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈缺口 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_缺陷_黑圈缺口 }}</span></template>
 					</el-table-column>
 					<el-table-column label="光圈" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_光圈 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_缺陷_光圈 }}</span></template>
 					</el-table-column>
 					<el-table-column label="发白" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_发白 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_缺陷_发白 }}</span></template>
 					</el-table-column>
 					<el-table-column label="漏光" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_漏光 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_缺陷_漏光 }}</span></template>
 					</el-table-column>
 					<el-table-column label="抽检不合格" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_抽检不合格 }}</span></template>
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_车间库存抽检_count_notok }}</span></template>
 					</el-table-column>
 					<el-table-column label="直通总合格数" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通总合格数 }}</span></template>
+						<template  #default="scope"><span v-if="scope.row.data.外观检验_车间库存抽检_count_notok">{{ scope.row.data.外观检验_完全总合格数- scope.row.data.外观检验_车间库存抽检_count_notok}}</span></template>
 					</el-table-column>
 					<el-table-column label="直通良率" class-name="colorheader7">
-						<template  #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通良率 }}</span></template>
+						<template  #default="scope"><span v-if="scope.row.data.外观检验_车间库存抽检_count_notok">{{ (((scope.row.data.外观检验_完全总合格数- scope.row.data.外观检验_车间库存抽检_count_notok)/scope.row.data.尺寸检验_count_real)*100 ).toFixed(2)}}</span></template>
 					</el-table-column>
 				</el-table-column>
 			</el-table>
@@ -667,8 +667,8 @@ export default {
 					propert = '外观检验_缺陷_破损';
 				}else if(index==53&&column.label=='发白'){
 					propert = '外观检验_缺陷_发白';
-				}else if(index==54&&column.label=='裂'){
-					propert = '外观检验_缺陷_裂';
+				}else if(index==54&&column.label=='裂纹'){
+					propert = '外观检验_缺陷_裂纹';
 				}else if(index==55&&column.label=='光圈'){
 					propert = '外观检验_缺陷_光圈';
 				}else if(index==56&&column.label=='漏光'){
@@ -707,8 +707,8 @@ export default {
 					propert = '外观检验_返修_缺陷_破损';
 				}else if(index==75&&column.label=='发白'){
 					propert = '外观检验_返修_缺陷_发白';
-				}else if(index==76&&column.label=='裂'){
-					propert = '外观检验_返修_缺陷_裂';
+				}else if(index==76&&column.label=='裂纹'){
+					propert = '外观检验_返修_缺陷_裂纹';
 				}else if(index==77&&column.label=='光圈'){
 					propert = '外观检验_返修_缺陷_光圈';
 				}else if(index==78&&column.label=='尺寸小'){
@@ -716,17 +716,17 @@ export default {
 				}else if(column.label=='外观总合格数'){
 					propert = '外观检验_完全总合格数';
 				}else if(index==83&&column.label=='黑圈变形'){
-					propert = '外观检验_抽检_缺陷_黑圈变形';
+					propert = '外观检验_车间库存抽检_缺陷_黑圈变形';
 				}else if(index==84&&column.label=='黑圈缺口'){
-					propert = '外观检验_抽检_缺陷_黑圈缺口';
+					propert = '外观检验_车间库存抽检_缺陷_黑圈缺口';
 				}else if(index==85&&column.label=='光圈'){
-					propert = '外观检验_抽检_缺陷_光圈';
+					propert = '外观检验_车间库存抽检_缺陷_光圈';
 				}else if(index==86&&column.label=='发白'){
-					propert = '外观检验_抽检_缺陷_发白';
+					propert = '外观检验_车间库存抽检_缺陷_发白';
 				}else if(index==87&&column.label=='漏光'){
-					propert = '外观检验_抽检_缺陷_漏光';
+					propert = '外观检验_车间库存抽检_缺陷_漏光';
 				}else if(index==88&&column.label=='抽检不合格'){
-					propert = '外观检验_抽检_缺陷_抽检不合格';
+					propert = '外观检验_车间库存抽检_count_notok';
 				}
 				if (propert!=='') {
 					const values = data.map((item) =>
@@ -775,6 +775,16 @@ export default {
 						sums[index] = ((sums[80]*sums[24])/100).toFixed(2);
 					}
 				}
+				if(index==89){
+					if(sums[88]&&sums[79]){
+						sums[index] = sums[79]-sums[88];
+					}
+				}
+				if(index==90){
+					if(sums[89]&&sums[5]){
+						sums[index] = ((sums[89]/sums[5])*100).toFixed(2);
+					}
+				}
 			});
 			return sums;
 		},