From 254beea5f89e6b6edc469cca1f56b99484cfc66e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 27 Jun 2025 14:53:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A0=B9=E6=8D=AE=E8=A6=81=E6=B1=82=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index d466f1fd..6b81493a 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -85,9 +85,9 @@
 					<el-table-column label="日期" class-name="colorheader1" width="90">
 						<template  #default="scope"><span>{{ scope.row.data.尺寸检验_日期 }}</span></template>
 					</el-table-column>
-					<el-table-column label="检验人" class-name="colorheader1">
+					<!-- <el-table-column label="检验人" class-name="colorheader1">
 						<template  #default="scope"><span>{{ scope.row.data.尺寸检验_操作人 }}</span></template>
-					</el-table-column>
+					</el-table-column> -->
 					<el-table-column label="检验数" class-name="colorheader1">
 						<template  #default="scope"><span>{{ scope.row.data.尺寸检验_count_real }}</span></template>
 					</el-table-column>
@@ -153,9 +153,9 @@
 					<el-table-column label="日期" class-name="colorheader2" width="90">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_日期 }}</span></template>
 					</el-table-column>
-					<el-table-column label="检验人" class-name="colorheader2">
+					<!-- <el-table-column label="检验人" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_操作人 }}</span></template>
-					</el-table-column>
+					</el-table-column> -->
 					<el-table-column label="检验数" class-name="colorheader2">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_count_real }}</span></template>
 					</el-table-column>
@@ -237,8 +237,14 @@
 					<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.外观检验_返修_count_real }}</span></template>
+					</el-table-column>
+					<el-table-column label="合格数" class-name="colorheader2">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_ok_full }}</span></template>
+					</el-table-column>
 				</el-table-column>
-				<el-table-column label="返修" align="center" class-name="colorheader3">
+				<!-- <el-table-column label="返修" align="center" class-name="colorheader3">
 					<el-table-column label="日期" class-name="colorheader3" width="90">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_日期 }}</span></template>
 					</el-table-column>
@@ -296,8 +302,8 @@
 					<el-table-column label="尺寸小" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_尺寸小 }}</span></template>
 					</el-table-column>
-				</el-table-column>
-				<el-table-column label="外观总合格数" class-name="colorheader4">
+				</el-table-column> -->
+				<el-table-column label="外观总合格数" class-name="colorheader3">
 					<template  #default="scope">
 						<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>
@@ -310,7 +316,7 @@
 						<span v-else>0</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="直通良率(%)" class-name="colorheader4">
+				<el-table-column label="直通良率(%)" class-name="colorheader5">
 					<template  #default="scope">
 						<span v-if="scope.row.data.外观检验_完全直通合格率">{{ scope.row.data.外观检验_完全直通合格率 }}</span>
 						<span v-else-if="scope.row.data.尺寸检验_合格率">{{ scope.row.data.尺寸检验_合格率 }}</span>