From f66ba501b01f88d27a39fcf40703bca171d5e70d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 21 May 2026 10:56:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=93413?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/good_check_gx.vue | 79 +++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue
index 9a5c1e0a..74738856 100644
--- a/src/views/statistics/good_check_gx.vue
+++ b/src/views/statistics/good_check_gx.vue
@@ -278,7 +278,7 @@
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_缺陷_漏光 }}</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>
@@ -289,6 +289,9 @@
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_real }}</span></template>
 					</el-table-column>
 					<el-table-column label="合格数" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_ok }}</span></template>
+					</el-table-column>
+					<el-table-column label="完全合格数" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_count_ok_full }}</span></template>
 					</el-table-column>
 					<el-table-column label="黑圈变形" class-name="colorheader3">
@@ -300,6 +303,9 @@
 					<el-table-column label="浅气泡(B)" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修_缺陷_浅气泡(B)'] }}</span></template>
 					</el-table-column>
+					<el-table-column label="划麻" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修_缺陷_划麻(返修)'] }}</span></template>
+					</el-table-column>
 					<el-table-column label="浅划麻(B)" class-name="colorheader3">
 						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修_缺陷_浅划麻(B)'] }}</span></template>
 					</el-table-column>
@@ -346,6 +352,77 @@
 						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_尺寸小 }}</span></template>
 					</el-table-column>
 				</el-table-column>
+				<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.外观检验_返修2_日期 }}</span></template>
+					</el-table-column>
+					<el-table-column label="检验人" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_操作人 }}</span></template>
+					</el-table-column>
+					<el-table-column label="返修数" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_real }}</span></template>
+					</el-table-column>
+					<el-table-column label="合格数" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_ok }}</span></template>
+					</el-table-column>
+					<el-table-column label="完全合格数" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_count_ok_full }}</span></template>
+					</el-table-column>
+					<el-table-column label="黑圈变形" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_黑圈变形 }}</span></template>
+					</el-table-column>
+					<el-table-column label="气泡" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_气泡 }}</span></template>
+					</el-table-column>
+					<el-table-column label="浅气泡(B)" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_浅气泡(B)'] }}</span></template>
+					</el-table-column>
+					<el-table-column label="浅划麻(B)" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_浅划麻(B)'] }}</span></template>
+					</el-table-column>
+					<el-table-column label="双面划麻" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_双面划麻 }}</span></template>
+					</el-table-column>
+					<el-table-column label="浅水纹(B)" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_浅水纹(B)'] }}</span></template>
+					</el-table-column>
+					<el-table-column label="重水纹" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_重水纹 }}</span></template>
+					</el-table-column>
+					<el-table-column label="大崩" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_大崩 }}</span></template>
+					</el-table-column>
+					<el-table-column label="小崩边(B)" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data['外观检验_返修2_缺陷_小崩边(B)'] }}</span></template>
+					</el-table-column>
+					<el-table-column label="倒角" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_倒角 }}</span></template>
+					</el-table-column>
+					<el-table-column label="棕点" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_棕点 }}</span></template>
+					</el-table-column>
+					<el-table-column label="漏光" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_漏光 }}</span></template>
+					</el-table-column>
+					<el-table-column label="黑圈缺口" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_黑圈缺口 }}</span></template>
+					</el-table-column>
+					<el-table-column label="破损" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_破损 }}</span></template>
+					</el-table-column>
+					<el-table-column label="发白" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_发白 }}</span></template>
+					</el-table-column>
+					<el-table-column label="裂纹" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_裂纹 }}</span></template>
+					</el-table-column>
+					<el-table-column label="光圈" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_光圈 }}</span></template>
+					</el-table-column>
+					<el-table-column label="尺寸小" class-name="colorheader3">
+						<template  #default="scope"><span>{{ scope.row.data.外观检验_返修2_缺陷_尺寸小 }}</span></template>
+					</el-table-column>
+				</el-table-column>
 				<el-table-column label="外观总合格数" class-name="colorheader4">
 					<template  #default="scope">
 						<span v-if="scope.row.data.外观检验_完全总合格数==0&&scope.row.data.外观检验_count_ok_full">{{ scope.row.data.外观检验_count_ok_full }}</span>