fix:检验工序统计分析表头与检验表一致，并将产品名称（除了毛坯检测）只保留name

src/views/statistics/bxerp/cpccjc.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -39,37 +42,42 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="垂直度" align="center" class-name="colorheader1">
+				<el-table-column label="倒角" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品尺寸检测_缺陷项_倒角==undefined?scope.row.data.成品尺寸检测_缺陷项_倒角:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="垂直度" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_垂直度==undefined?scope.row.data.成品尺寸检测_缺陷项_垂直度:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="尖角" align="center" class-name="colorheader2">
+				<el-table-column label="尖角" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_尖角?scope.row.data.成品尺寸检测_缺陷项_尖角:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="有效" align="center" class-name="colorheader3">
+				<el-table-column label="有效" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_有效?scope.row.data.成品尺寸检测_缺陷项_有效:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="面型" align="center" class-name="colorheader4">
+				<el-table-column label="面型" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_面型?scope.row.data.成品尺寸检测_缺陷项_面型:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="台径小" align="center" class-name="colorheader5">
+				<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="colorheader6">
+				<el-table-column label="台径大" align="center" class-name="colorheader7">
 					<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">
+				<el-table-column label="备注" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/cpwgfj1.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -94,12 +97,107 @@
 						<span>{{scope.row.data.成品外观复检一_缺陷项_粗糙度?scope.row.data.成品外观复检一_缺陷项_粗糙度:0 }}</span>
 					</template>
 				</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>
+					</template>
+				</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="colorheader6">
+				<el-table-column label="毛坯长点" align="center" class-name="colorheader7">
+					<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 label="白边" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_白边?scope.row.data.成品外观复检一_缺陷项_白边:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="扭后点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_扭后点?scope.row.data.成品外观复检一_缺陷项_扭后点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="黑网" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.成品外观复检一_缺陷项_白网?scope.row.data.成品外观复检一_缺陷项_白网:0 }}</span>
+					</template>
+				</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.成品外观复检一_缺陷项_花朵重?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 label="六角" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_六角?scope.row.data.成品外观复检一_缺陷项_六角:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角白点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_六角白点?scope.row.data.成品外观复检一_缺陷项_六角白点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角黑点" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.成品外观复检一_缺陷项_复丝结构?scope.row.data.成品外观复检一_缺陷项_复丝结构:0 }}</span>
+					</template>
+				</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.成品外观复检一_缺陷项_畸变?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 label="偏心" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_偏心?scope.row.data.成品外观复检一_缺陷项_偏心:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_炸废?scope.row.data.成品外观复检一_缺陷项_炸废:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检一_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/cpwgfj2.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -41,7 +44,7 @@
 				</el-table-column>
 				<el-table-column label="划伤" align="center" class-name="colorheader1">
 					<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="colorheader2">
@@ -66,12 +69,12 @@
 				</el-table-column>
 				<el-table-column label="硌/坑" align="center" class-name="colorheader6">
 					<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="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="台阶" align="center" class-name="colorheader1">
@@ -94,12 +97,107 @@
 						<span>{{scope.row.data.成品外观复检二_缺陷项_粗糙度?scope.row.data.成品外观复检二_缺陷项_粗糙度:0 }}</span>
 					</template>
 				</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>
+					</template>
+				</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="colorheader6">
+				<el-table-column label="毛坯长点" align="center" class-name="colorheader7">
+					<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 label="白边" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_白边?scope.row.data.成品外观复检二_缺陷项_白边:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="扭后点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_扭后点?scope.row.data.成品外观复检二_缺陷项_扭后点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="黑网" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.成品外观复检二_缺陷项_白网?scope.row.data.成品外观复检二_缺陷项_白网:0 }}</span>
+					</template>
+				</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.成品外观复检二_缺陷项_花朵重?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 label="六角" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_六角?scope.row.data.成品外观复检二_缺陷项_六角:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角白点" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_六角白点?scope.row.data.成品外观复检二_缺陷项_六角白点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="六角黑点" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.成品外观复检二_缺陷项_复丝结构?scope.row.data.成品外观复检二_缺陷项_复丝结构:0 }}</span>
+					</template>
+				</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.成品外观复检二_缺陷项_畸变?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 label="偏心" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_偏心?scope.row.data.成品外观复检二_缺陷项_偏心:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_炸废?scope.row.data.成品外观复检二_缺陷项_炸废:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检二_缺陷项_备注 }}</span>
 					</template>
@@ -133,7 +231,7 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {},obj3={};
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
 			obj.field = 'data__成品外观复检二_批次号';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';

src/views/statistics/bxerp/cpwgnzcj.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -189,12 +192,17 @@
 						<span>{{ scope.row.data.成品内外初检_缺陷项_角偏?scope.row.data.成品内外初检_缺陷项_角偏:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="炸废" align="center" class-name="colorheader2">
+				<el-table-column label="亮斑" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内外初检_缺陷项_亮斑?scope.row.data.成品内外初检_缺陷项_亮斑:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内外初检_缺陷项_炸废?scope.row.data.成品内外初检_缺陷项_炸废:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader3">
+				<el-table-column label="备注" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内外初检_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/cpwgnzfj.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -99,22 +102,22 @@
 						<span>{{ scope.row.data.成品内质复检_缺陷项_白边?scope.row.data.成品内质复检_缺陷项_白边:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="复丝结构" align="center" class-name="colorheader5">
+				<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="colorheader6">
+				<el-table-column label="炫光" align="center" class-name="colorheader7">
 					<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">
+				<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">
+				<el-table-column label="畸变" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内质复检_缺陷项_畸变?scope.row.data.成品内质复检_缺陷项_畸变:0 }}</span>
 					</template>
@@ -126,12 +129,12 @@
 				</el-table-column>
 				<el-table-column label="划伤" align="center" 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="腐蚀A" align="center" class-name="colorheader5">
+				<el-table-column label="腐蚀" align="center" class-name="colorheader5">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品内质复检_缺陷项_腐蚀A?scope.row.data.成品内质复检_缺陷项_腐蚀A:0 }}</span>
+						<span>{{ scope.row.data.成品内质复检_缺陷项_腐蚀?scope.row.data.成品内质复检_缺陷项_腐蚀:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="崩边" align="center" class-name="colorheader6">
@@ -189,12 +192,12 @@
 						<span>{{ scope.row.data.成品内质复检_缺陷项_角偏?scope.row.data.成品内质复检_缺陷项_角偏:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="炸废" align="center" class-name="colorheader2">
+				<el-table-column label="亮斑" align="center" class-name="colorheader3">
 					<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="colorheader3">
+				<el-table-column label="备注" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内质复检_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/cpxnjy.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -54,21 +57,21 @@
 						<span>{{ scope.row.data.成品性能检测_缺陷项_直区?scope.row.data.成品性能检测_缺陷项_直区:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="S畸变不合格" align="center" class-name="colorheader4">
+				<el-table-column label="角偏" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品性能检测_缺陷项_角偏?scope.row.data.成品性能检测_缺陷项_角偏:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品性能检测_缺陷项_S畸变不合格?scope.row.data.成品性能检测_缺陷项_S畸变不合格:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="扭转角不合格" align="center" class-name="colorheader5">
+				<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="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.成品性能检测_缺陷项_白边?scope.row.data.成品性能检测_缺陷项_白边:0 }}</span>
@@ -104,12 +107,7 @@
 						<span>{{ scope.row.data.成品性能检测_缺陷项_垂直度?scope.row.data.成品性能检测_缺陷项_垂直度:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="角尖" align="center" class-name="colorheader7">
+				<el-table-column label="备注" align="center" class-name="colorheader7">
-					<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.成品性能检测_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/cpzj.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -39,9 +42,9 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="腐蚀A" align="center" class-name="colorheader1">
+				<el-table-column label="腐蚀" align="center" class-name="colorheader1">
 					<template #default="scope">
-						<span>{{ scope.row.data.成品自检_缺陷项_腐蚀A?scope.row.data.成品自检_缺陷项_腐蚀A:0 }}</span>
+						<span>{{ scope.row.data.成品自检_缺陷项_腐蚀?scope.row.data.成品自检_缺陷项_腐蚀:0 }}</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="亮道" align="center" class-name="colorheader2">
@@ -49,9 +52,9 @@
 						<span>{{ scope.row.data.成品自检_缺陷项_亮道?scope.row.data.成品自检_缺陷项_亮道:0 }}</span>
 					</template>
 				</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.成品自检_缺陷项_凹面坑?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="colorheader4">
@@ -64,92 +67,77 @@
 						<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="平面划" align="center" class-name="colorheader6">
 					<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="colorheader7">
+				<el-table-column label="圆角划" align="center" class-name="colorheader7">
+					<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 label="台" align="center" class-name="colorheader1">
+				<el-table-column label="大/凹面麻" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data['成品自检_缺陷项_大/凹面麻']?scope.row.data['成品自检_缺陷项_大/凹面麻']:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="小面麻" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品自检_缺陷项_小面麻?scope.row.data.成品自检_缺陷项_小面麻:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.成品自检_缺陷项_台?scope.row.data.成品自检_缺陷项_台:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="大外划硌" align="center" class-name="colorheader2">
+				<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="colorheader3">
-					<template #default="scope">
-						<span>{{ scope.row.data.成品自检_缺陷项_炸?scope.row.data.成品自检_缺陷项_炸:0 }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="崩废" align="center" class-name="colorheader4">
-					<template #default="scope">
-						<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.成品自检_缺陷项_小崩?scope.row.data.成品自检_缺陷项_小崩:0 }}</span>
 					</template>
 				</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.成品自检_缺陷项_前角崩?scope.row.data.成品自检_缺陷项_前角崩:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="小柱划" align="center" class-name="colorheader1">
+				<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="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品自检_缺陷项_小柱划?scope.row.data.成品自检_缺陷项_小柱划:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="前小柱划" align="center" class-name="colorheader2">
+				<el-table-column label="总厚" align="center" class-name="colorheader3">
 					<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="colorheader3">
+				<el-table-column label="大外划硌" align="center" 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="平麻" align="center" class-name="colorheader4">
+				<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">
+				<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="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.成品自检_缺陷项_小面硌?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 label="备注" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品自检_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/fenjian.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">

src/views/statistics/bxerp/gzcpjc.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">

src/views/statistics/bxerp/maopi.vue

@@ -156,6 +156,11 @@
 						<span>{{ scope.row.data.毛坯检测_缺陷项_色差?scope.row.data.毛坯检测_缺陷项_色差:0 }}</span>
 					</template>
 				</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>

src/views/statistics/bxerp/niuzhuan.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -56,115 +59,130 @@
 				<el-table-column label="暗点" align="center" class-name="colorheader2">
 					<el-table-column label="内标合格" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data.扭后检测_检测项_暗点=='合格'">1</span>
+							<span>{{ scope.row.data.扭后检测_检测项_暗点合格?scope.row.data.扭后检测_检测项_暗点合格:0 }}</span>
-							<span v-else>0</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点不合格" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data.扭后检测_检测项_暗点=='不合格'">1</span>
+							<span>{{ scope.row.data.扭后检测_检测项_暗点不合格?scope.row.data.扭后检测_检测项_暗点不合格:0 }}</span>
-							<span v-else>0</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="可加工" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data.扭后检测_检测项_暗点==''||scope.row.data.扭后检测_检测项_暗点==null">1</span>
+							<span v-if="scope.row.data.扭后检测_检测项_暗点合格||scope.row.data.扭后检测_检测项_暗点不合格">0</span>
-							<span v-else>0</span>
+							<span v-else>1</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="轻" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{scope.row.data.扭后检测_缺陷项_暗点重?scope.row.data.扭后检测_缺陷项_暗点重:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="黑网" align="center" class-name="colorheader4">
+					<el-table-column label="轻" align="center" class-name="colorheader4">
 						<template #default="scope">
 							<span>{{ scope.row.data.扭后检测_缺陷项_黑网轻?scope.row.data.扭后检测_缺陷项_黑网轻:0 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="重" align="center" class-name="colorheader3">
+					<el-table-column label="重" align="center" class-name="colorheader4">
 						<template #default="scope">
 							<span>{{ scope.row.data.扭后检测_缺陷项_黑网重?scope.row.data.扭后检测_缺陷项_黑网重:0 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="废" align="center" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_缺陷项_黑网废?scope.row.data.扭后检测_缺陷项_黑网废:0 }}</span>
+						</template>
 					</el-table-column>
-				<el-table-column label="白网" align="center" class-name="colorheader4">
+				</el-table-column>
-					<el-table-column label="轻" align="center" class-name="colorheader4">
+				<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>
 						</template>
 					</el-table-column>
-					<el-table-column label="重" align="center" class-name="colorheader4">
+					<el-table-column label="重" align="center" class-name="colorheader5">
 						<template #default="scope">
 							<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="colorheader6">
-					<el-table-column label="轻" align="center" class-name="colorheader5">
+					<el-table-column label="轻" align="center" class-name="colorheader6">
 						<template #default="scope">
 							<span>{{scope.row.扭后检测_缺陷项_小网轻? scope.row.扭后检测_缺陷项_小网轻:0}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="重" align="center" class-name="colorheader5">
+					<el-table-column label="重" align="center" class-name="colorheader6">
 						<template #default="scope">
 							<span>{{scope.row.扭后检测_缺陷项_小网重?scope.row.扭后检测_缺陷项_小网重:0 }}</span>
 						</template>
 					</el-table-column>
-				</el-table-column>
+					<el-table-column label="废" align="center" class-name="colorheader6">
-				<el-table-column label="扭后" align="center" class-name="colorheader6">
-					<el-table-column label="炸废" align="center" class-name="colorheader6">
 						<template #default="scope">
-							<span>{{scope.row.data.扭后检测_缺陷项_扭后炸废?scope.row.data.扭后检测_缺陷项_扭后炸废:0 }}</span>
+							<span>{{scope.row.扭后检测_缺陷项_小网废?scope.row.扭后检测_缺陷项_小网废:0 }}</span>
-						</template>
-					</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>
-				
 				<el-table-column label="分辨率" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span>{{scope.row.data.扭后检测_缺陷项_分辨率?scope.row.data.扭后检测_缺陷项_分辨率:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="S畸变不合格" align="center" class-name="colorheader1">
+				<el-table-column label="扭后" align="center" class-name="colorheader1">
+					<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="改直" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{scope.row.data.扭后检测_缺陷项_改直?scope.row.data.扭后检测_缺陷项_改直:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{scope.row.data.扭后检测_缺陷项_S畸变不合格?scope.row.data.扭后检测_缺陷项_S畸变不合格:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader2">
+				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader4">
 					<template #default="scope">
 						<span>{{scope.row.data.扭后检测_缺陷项_弓形畸变不合格?scope.row.data.扭后检测_缺陷项_S畸变不合格:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="角偏" align="center" class-name="colorheader3">
+				<el-table-column label="角偏" align="center" class-name="colorheader5">
 					<template #default="scope">
 						<span>{{scope.row.data.扭后检测_缺陷项_角偏?scope.row.data.扭后检测_缺陷项_角偏:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="花丝" align="center" class-name="colorheader4">
+				<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="colorheader5">
+				<el-table-column label="高差" align="center" class-name="colorheader7">
-					<el-table-column label="重" align="center" class-name="colorheader5">
-						<template #default="scope">
-							<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.扭后检测_缺陷项_暗点合格?scope.row.data.扭后检测_缺陷项_暗点合格:0 }}</span>
-						</template>
-					</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">
+				<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="colorheader2">
+					<template #default="scope">
+						<span>{{scope.row.data.扭后检测_缺陷项_改实验?scope.row.data.扭后检测_缺陷项_改实验:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span v-if="scope.row.扭后检测_备注">{{scope.row.扭后检测_备注 }}</span>
 					</template>

src/views/statistics/bxerp/zhongjian1.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">
@@ -124,7 +127,12 @@
 						<span>{{ scope.row.data.中检一_缺陷项_量崩?scope.row.data.中检一_缺陷项_量崩:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader4">
+				<el-table-column label="坑" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<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.中检一_缺陷项_备注 }}</span>
 					</template>

src/views/statistics/bxerp/zhongjian2.vue

@@ -31,6 +31,9 @@
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
 				<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column label="批次号" fixed="left">
 					<template #default="scope">