From da13175ebbd449119519a32be34f5847a833a521 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 29 Oct 2025 16:27:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=AF=9B=E5=9D=AF=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/maopi.vue | 77 +++++++++++++++-------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index a3b64935..78e5d71a 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -63,7 +63,7 @@
 					</el-table-column>
 					<el-table-column label="合格数" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']?1-scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']:1 }}</span>
+							<span>{{ scope.row.data['毛坯检测_缺陷项_放大率￠16mm不合格']?0:1 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -92,20 +92,17 @@
 				<el-table-column label="暗点" align="center" class-name="colorheader4">
 					<el-table-column label="内标合格" class-name="colorheader4">
 						<template #default="scope">
-							<span v-if="scope.row.data.毛坯检测_检测项_暗点=='合格'">1</span>
-							<span v-else>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 v-if="scope.row.data.毛坯检测_检测项_暗点=='不合格'">1</span>
-							<span v-else>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 v-if="scope.row.data.毛坯检测_检测项_暗点!=='合格'&&scope.row.data.毛坯检测_检测项_暗点!=='不合格'">1</span>
-							<span v-else>0</span>
+							<span>{{ !scope.row.data.毛坯检测_检测项_暗点合格&&!scope.row.data.毛坯检测_检测项_暗点不合格?1:0 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -125,11 +122,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="花朵" align="center" class-name="colorheader1">
-					<template #default="scope">
-						<span>{{scope.row.data.毛坯检测_缺陷项_花朵?scope.row.data.毛坯检测_缺陷项_花朵:0 }}</span>
-					</template>
+					<el-table-column label="轻" align="center" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{scope.row.data.毛坯检测_缺陷项_花朵?scope.row.data.毛坯检测_缺陷项_花朵:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="重" align="center" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{scope.row.data.毛坯检测_缺陷项_花朵重?scope.row.data.毛坯检测_缺陷项_花朵重:0 }}</span>
+						</template>
+					</el-table-column>
 				</el-table-column>
-				<el-table-column label="S畸变" align="center" class-name="colorheader2">
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{scope.row.data.毛坯检测_缺陷项_S畸变不合格?scope.row.data.毛坯检测_缺陷项_S畸变不合格:0 }}</span>
 					</template>
@@ -149,14 +153,11 @@
 						<span>{{ scope.row.data.毛坯检测_缺陷项_角偏?scope.row.data.毛坯检测_缺陷项_角偏:0 }}</span>
 					</template>
 				</el-table-column>
-				<!-- <el-table-column label="出口" align="center" class-name="colorheader6">
-					<el-table-column label="国标" class-name="colorheader6">
-					</el-table-column>
-					<el-table-column label="内标" class-name="colorheader6">
-					</el-table-column>
-					<el-table-column label="内标放宽" class-name="colorheader6">
-					</el-table-column>
-				</el-table-column> -->
+				<el-table-column label="色差" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.毛坯检测_缺陷项_色差?scope.row.data.毛坯检测_缺陷项_色差:0 }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="备注" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span>{{ scope.row.data.毛坯检测_缺陷项_备注 }}</span>
@@ -249,8 +250,14 @@ export default {
 				if(index == 10&&column.label=='可加工'){
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
 				}
-				if(index == 11&&column.label=='内标合格'||index == 12&&column.label=='长点不合格'||index == 13&&column.label=='可加工'){
-					propert= '毛坯检测_检测项_暗点';
+				if(index == 11&&column.label=='内标合格'){
+					propert= '毛坯检测_检测项_暗点合格';
+				}
+				if(index == 12&&column.label=='长点不合格'){
+					propert= '毛坯检测_检测项_暗点不合格';
+				}
+				if(index == 13&&column.label=='可加工'){
+					propert= '毛坯检测_检测项_暗点合格';
 				}
 				if(index == 14&&column.label=='暗点重'){
 					propert= '毛坯检测_缺陷项_暗点重';
@@ -261,35 +268,37 @@ export default {
 				if(index == 16&&column.label=='网格'){
 					propert= '毛坯检测_缺陷项_网格';
 				}
-				if(index == 17&&column.label=='花朵'){
+				if(index == 17&&column.label=='轻'){
 					propert= '毛坯检测_缺陷项_花朵';
 				}
-				if(index == 18&&column.label=='S畸变'){
+				if(index == 18&&column.label=='重'){
+					propert= '毛坯检测_缺陷项_花朵重';
+				}
+				if(index == 19&&column.label=='S畸变不合格'){
 					propert= '毛坯检测_缺陷项_S畸变不合格';
 				}
-				if(index == 19&&column.label=='弓形畸变不合格'){
+				if(index == 20&&column.label=='弓形畸变不合格'){
 					propert= '毛坯检测_缺陷项_弓形畸变不合格';
 				}
-				if(index == 20&&column.label=='炸废'){
+				if(index == 21&&column.label=='炸废'){
 					propert= '毛坯检测_缺陷项_炸废';
 				}
-				if(index == 21&&column.label=='角偏'){
+				if(index == 22&&column.label=='角偏'){
 					propert= '毛坯检测_缺陷项_角偏';
 				}
+				if(index == 23&&column.label=='色差'){
+					propert= '毛坯检测_缺陷项_色差';
+				}
 				if (propert!=='') {
 					let values = [];
 					if(index==4||index==6){
 						values = data.map((item) =>!item.data[propert]?1:0);
 					}else if(index==9){
 						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0);
-					}else if(index==11){
-						values = data.map((item) =>item.data[propert]=='合格'?1:0);
-					}else if(index==12){
-						values = data.map((item) =>item.data[propert]=='不合格'?1:0);
 					}else if(index==13){
-						values = data.map((item) =>item.data[propert]!=='合格'&&item.data[propert]!=='不合格'?1:0);
+						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_检测项_暗点不合格']?1:0);
 					}else{
-						values = data.map((item) =>item.data[propert]!==undefined?Number(item.data[propert]):0);
+						values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);
 					}
 					console.log('values',values);
 					if (!values.every((value) => Number.isNaN(value))) {
@@ -298,12 +307,8 @@ export default {
 							let sum = 0;
 							sum = Number(Number(prev) + Number(curr));
 							if (!isNaN(value)) {
-								// let rate = Number(sum/total*100).toFixed(2);
-								// return  <p class="count_row"><div  ref="borrowAmount1">{sum}</div><br /><div  ref="borrowAmount2">{rate}</div></p>
 								return sum;
 							} else {
-								// let rate = Number(prev/total*100).toFixed(2);
-								// return  <p class="count_row"><div  ref="borrowAmount1">{prev}</div><br /><div  ref="borrowAmount2">{rate}</div></p>
 								return prev;
 							}
 						}, 0);