From bf3863751c2ac82abe50502c254aaff2cc4c6a19 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 20 Aug 2025 16:55:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=90=88=E6=A0=BC=E7=8E=87=E4=B8=BA0?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/statistics_bang.vue | 22 +++---
 src/views/statistics/statistics_guan.vue | 89 ++----------------------
 2 files changed, 18 insertions(+), 93 deletions(-)

diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index f985c702..ab664d33 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -67,7 +67,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader2">
 							<template #default="scope">
-								<span v-if="scope.row.data&&scope.row.data.棒料成型_合格率">{{ scope.row.data.棒料成型_合格率 }}%</span>
+								<span v-if="scope.row.data&&(scope.row.data.棒料成型_合格率||scope.row.data.棒料成型_合格率==0)">{{ scope.row.data.棒料成型_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="炸纹" class-name="colorheader2">
@@ -139,7 +139,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader3">
 							<template #default="scope">
-								<span v-if="scope.row.data&&scope.row.data.七车间入库_合格率">{{ scope.row.data.七车间入库_合格率 }}%</span>
+								<span v-if="scope.row.data&&(scope.row.data.七车间入库_合格率||scope.row.data.七车间入库_合格率==0)">{{ scope.row.data.七车间入库_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="炸纹" class-name="colorheader3">
@@ -213,7 +213,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader1">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间_平头_合格率">{{ scope.row.data.六车间_平头_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_平头_合格率||scope.row.data.六车间_平头_合格率==0)">{{ scope.row.data.六车间_平头_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							
@@ -237,7 +237,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader2">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间_粘铁头_合格率">{{ scope.row.data.六车间_粘铁头_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_粘铁头_合格率||scope.row.data.六车间_粘铁头_合格率==0)">{{ scope.row.data.六车间_粘铁头_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="不合格数" class-name="colorheader2">
@@ -265,7 +265,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader3">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间_粗中细磨_合格率">{{ scope.row.data.六车间_粗中细磨_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_粗中细磨_合格率||scope.row.data.六车间_粗中细磨_合格率==0)">{{ scope.row.data.六车间_粗中细磨_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="不合格数" class-name="colorheader3">
@@ -323,7 +323,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间_抛光_合格率">{{ scope.row.data.六车间_抛光_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_抛光_合格率||scope.row.data.六车间_抛光_合格率==0)">{{ scope.row.data.六车间_抛光_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="划伤" class-name="colorheader4">
@@ -371,7 +371,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader5">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间_开槽_合格率">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_开槽_合格率||scope.row.data.六车间_开槽_合格率==0)">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="加工日期" class-name="colorheader5" min-width="160">
@@ -394,7 +394,7 @@
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data&&scope.row.data.六车间中检_合格率">{{ scope.row.data.六车间中检_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间中检_合格率||scope.row.data.六车间中检_合格率==0)">{{ scope.row.data.六车间中检_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="不合格数" class-name="colorheader6">
@@ -462,7 +462,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data&&scope.row.data.六车间生产入库_合格率">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
+								<span v-if="scope.row.data&&(scope.row.data.六车间生产入库_合格率||scope.row.data.六车间生产入库_合格率==0)">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数" class-name="colorheader5">
@@ -523,12 +523,12 @@
 					</el-table-column>
 					<el-table-column label="6号领取加工-发货合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.六车间_批次发货合格率">{{ scope.row.data.六车间_批次发货合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.六车间_批次发货合格率||scope.row.data.六车间_批次发货合格率==0)">{{ scope.row.data.六车间_批次发货合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="7号生产-发货合格率" class-name="colorheader3">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.七车间_批次发货合格率">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.七车间_批次发货合格率||scope.row.data.七车间_批次发货合格率==0)">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
 						</template>
 					</el-table-column>
 				</scTable>
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 367b09d4..919bf23e 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -67,7 +67,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.管料成型_合格率">{{ scope.row.data.管料成型_合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.管料成型_合格率||scope.row.data.管料成型_合格率==0)">{{ scope.row.data.管料成型_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader1">
@@ -134,7 +134,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.十车间入库_合格率">{{ scope.row.data.十车间入库_合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.十车间入库_合格率||scope.row.data.十车间入库_合格率==0)">{{ scope.row.data.十车间入库_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader2">
@@ -188,81 +188,6 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<!-- <el-table-column label="8号入库" align="center" class-name="colorheader3">
-					<el-table-column label="时间"  width="100px" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_日期 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="入库数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_ok }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_合格率 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格数" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_notok }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="椭圆/弯曲" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_wq }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="条纹" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_tw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="断裂" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dl }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="偏壁" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_pb }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="大小头" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dxt }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结石" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="其他" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'十车间入库')}}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="备注" class-name="colorheader3">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_检验备注 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="接收人" class-name="colorheader3">
-						<template #default="scope">{{ scope.row.data.十车间入库_备注 }}</template>
-					</el-table-column>
-				</el-table-column> -->
 				<el-table-column label="退火" align="center" class-name="colorheader3">
 					<el-table-column label="时间" width="160px" class-name="colorheader3">
 						<template #default="scope">
@@ -383,7 +308,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader1">
 							<template #default="scope">
-								<span v-if="scope.row.data&&scope.row.data.六车间_开槽_合格率">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
+								<span v-if="scope.row.data&&(scope.row.data.六车间_开槽_合格率||scope.row.data.六车间_开槽_合格率==0)">{{ scope.row.data.六车间_开槽_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数" class-name="colorheader1">
@@ -425,7 +350,7 @@
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader2">
 							<template #default="scope">
-								<span v-if="scope.row.data&&scope.row.data.六车间_倒角_合格率">{{ scope.row.data.六车间_倒角_合格率 }}%</span>
+								<span v-if="scope.row.data&&(scope.row.data.六车间_倒角_合格率||scope.row.data.六车间_倒角_合格率==0)">{{ scope.row.data.六车间_倒角_合格率 }}%</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数" class-name="colorheader2">
@@ -469,7 +394,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader5">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.六车间中检_合格率">{{ scope.row.data.六车间中检_合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.六车间中检_合格率||scope.row.data.六车间中检_合格率==0)">{{ scope.row.data.六车间中检_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader5">
@@ -541,7 +466,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader6">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.六车间生产入库_检验日期!==''&&scope.row.data.六车间生产入库_合格率">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.六车间生产入库_合格率||scope.row.data.六车间生产入库_合格率==0)">{{ scope.row.data.六车间生产入库_合格率 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader6">
@@ -577,7 +502,7 @@
 				</el-table-column>
 				<el-table-column label="领管-终检合格率">
 					<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.七车间_批次发货合格率">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.七车间_批次发货合格率||scope.row.data.七车间_批次发货合格率==0)">{{ scope.row.data.七车间_批次发货合格率 }}%</span>
 						</template>
 				</el-table-column>
 				<el-table-column label="组合件批次号" min-width="160">