From d5f8ecfec0eaadc2c86d5cfeb4627f227ecfc7c8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Jun 2025 14:22:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BA=A4=E6=8E=A5=E6=97=B6?=
 =?UTF-8?q?=E6=96=B0=E6=89=B9=E6=AC=A1=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/process_statistics_gx.vue | 14 +++++++-------
 src/views/wpm_bx/handover.vue                  |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/statistics/process_statistics_gx.vue b/src/views/statistics/process_statistics_gx.vue
index 5fc9e0b0..cc29baac 100644
--- a/src/views/statistics/process_statistics_gx.vue
+++ b/src/views/statistics/process_statistics_gx.vue
@@ -230,7 +230,7 @@
 							<el-table-column label="大崩" class-name="colorheader4">
 								<template  #default="scope"><span>{{ scope.row.data.倒角_加工前_缺陷_崩边 }}</span></template>
 							</el-table-column>
-							<el-table-column label="小崩边(B)" class-name="colorheader4">
+							<el-table-column label="小崩边" class-name="colorheader4">
 								<template  #default="scope"><span>{{ scope.row.data.倒角_加工前_缺陷_崩边 }}</span></template>
 							</el-table-column>
 							<el-table-column label="其他" class-name="colorheader4">
@@ -267,7 +267,7 @@
 							<el-table-column label="大崩" class-name="colorheader4">
 								<template  #default="scope"><span>{{ scope.row.data.倒角_缺陷_崩边 }}</span></template>
 							</el-table-column>
-							<el-table-column label="小崩边(B)" class-name="colorheader4">
+							<el-table-column label="小崩边" class-name="colorheader4">
 								<template  #default="scope"><span>{{ scope.row.data.倒角_缺陷_小崩边 }}</span></template>
 							</el-table-column>
 						</el-table-column>
@@ -355,7 +355,7 @@
 							<el-table-column label="大崩" class-name="colorheader6">
 								<template  #default="scope"><span>{{ scope.row.data.减薄B_缺陷_崩边 }}</span></template>
 							</el-table-column>
-							<el-table-column label="小崩边(B)" class-name="colorheader6">
+							<el-table-column label="小崩边" class-name="colorheader6">
 								<template  #default="scope"><span>{{ scope.row.data.减薄B_缺陷_小崩边 }}</span></template>
 							</el-table-column>
 						</el-table-column>
@@ -711,7 +711,7 @@ export default {
 					if (data.倒角_加工前_缺陷_小崩边 !== undefined) {
 						count += data.倒角_加工前_缺陷_小崩边 ;
 					}
-					count_qt = data.扫边B_count_pn_jgqbl - count;
+					count_qt = data.倒角_count_pn_jgqbl - count;
 					return count_qt;
 				}
 			}else if(type=='倒角'){
@@ -797,7 +797,7 @@ export default {
 					if (data.磨抛_加工前_缺陷_小崩边 !== undefined) {
 						count += data.磨抛_加工前_缺陷_小崩边 ;
 					}
-					count_qt = data.扫边B_count_pn_jgqbl - count;
+					count_qt = data.磨抛_count_pn_jgqbl - count;
 					return count_qt;
 				}
 			}else if(type=='磨抛'){
@@ -826,7 +826,7 @@ export default {
 					if (data.一次超洗_加工前_缺陷_小崩边 !== undefined) {
 						count += data.一次超洗_加工前_缺陷_小崩边 ;
 					}
-					count_qt = data.扫边B_count_pn_jgqbl - count;
+					count_qt = data.一次超洗_count_pn_jgqbl - count;
 					return count_qt;
 				}
 			}else if(type=='一次超洗'){
@@ -854,7 +854,7 @@ export default {
 					if (data.二次超洗_加工前_缺陷_小崩边 !== undefined) {
 						count += data.二次超洗_加工前_缺陷_小崩边 ;
 					}
-					count_qt = data.扫边B_count_pn_jgqbl - count;
+					count_qt = data.二次超洗_count_pn_jgqbl - count;
 					return count_qt;
 				}
 			}else if(type=='二次超洗'){
diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue
index 52d59d86..029ce7c7 100644
--- a/src/views/wpm_bx/handover.vue
+++ b/src/views/wpm_bx/handover.vue
@@ -70,6 +70,7 @@
 				<el-table-column type="expand">
 						<template #default="props">
 							<div style="padding-left: 50px">
+								<div v-if="props.row.new_batch&&props.row.new_batch!= null" style="font-size: 14px;">新批次号：{{ props.row.new_batch }}</div>
 								<template v-for="item in props.row.handoverb" :key="item.id">
 									<el-descriptions :column="3">
 										<el-descriptions-item label="批次">