From 9c46866c814aac1726e4799b9c5e3164b9cf7059 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 9 Oct 2025 10:45:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=AF=9B=E5=9D=AF=E6=A3=80=E6=B5=8B=5F?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=5F=E5=8F=98=E6=9B=B4=E4=B8=BA=5F=E5=90=AB?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=5F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/maopiTotal.vue | 52 +++++++++++------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/views/statistics/bxerp/maopiTotal.vue b/src/views/statistics/bxerp/maopiTotal.vue
index ac599aaf..000225df 100644
--- a/src/views/statistics/bxerp/maopiTotal.vue
+++ b/src/views/statistics/bxerp/maopiTotal.vue
@@ -48,24 +48,24 @@
 				<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
 					<el-table-column label="合格数" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
 					<el-table-column label="合格数" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -73,80 +73,80 @@
 					<el-table-column label="合格数" class-name="colorheader3">
 						<!-- 总数-不合格数-可加工数 -->
 						<template #default="scope">
-							<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']">
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span>
-								<span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']}}</span>
+							<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']">
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
+								<span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']}}</span>
 							</span>
 							<span v-else>
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span>
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
 								<span v-else>{{ scope.row.data.毛坯检测_count_use }}</span>
 							</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader3">
 						<template #default="scope">
-							<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例']">
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例'] }}</span>
-								<span v-else>{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格_比例'] }}%</span>
+							<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']">
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}</span>
+								<span v-else>{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例'] }}%</span>
 							</span>
 							<span v-else>
-								<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
+								<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
 								<span v-else>100%</span>
 							</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="可加工" class-name="colorheader3">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']:0 }}</span>
+							<span>{{ scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="加工率" class-name="colorheader3">
 						<template #default="scope">
-							<span>{{  scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
+							<span>{{  scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="暗点" align="center" class-name="colorheader4">
 					<el-table-column label="内标数" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_含缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_缺陷_暗点不合格_比例:100 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点数" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_暗点不合格_比例?scope.row.data.毛坯检测_缺陷_暗点不合格_比例:0 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:0 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="崩炸" align="center" class-name="colorheader5">
 					<el-table-column label="崩" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_崩?scope.row.data.毛坯检测_缺陷_崩:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_崩?scope.row.data.毛坯检测_含缺陷_崩:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_缺陷_崩_比例?100-scope.row.data.毛坯检测_缺陷_崩_比例:100 }}%</span>
+							<span>{{  scope.row.data.毛坯检测_含缺陷_崩_比例?100-scope.row.data.毛坯检测_含缺陷_崩_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="炸废" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_炸废?scope.row.data.毛坯检测_缺陷_炸废:0 }}</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废?scope.row.data.毛坯检测_含缺陷_炸废:0 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_缺陷_炸废_比例?100-scope.row.data.毛坯检测_缺陷_炸废_比例:100 }}%</span>
+							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?100-scope.row.data.毛坯检测_含缺陷_炸废_比例:100 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -164,16 +164,16 @@
 				</el-table-column>
 				<el-table-column label="长点试加工数" align="center" class-name="colorheader7">
 					<template #default="scope">
-						<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span>
+						<span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1">
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader3">
+				<!-- <el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
-						<span>{{ scope.row.data.毛坯检测_缺陷_备注 }}</span>
+						<span>{{ scope.row.data.毛坯检测_含缺陷_备注 }}</span>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 			</scTable>
 		</el-main>
 	</el-container>