From 8335607623561dcbd456c538200ea530861adca6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Apr 2025 11:11:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/statistics_bang.vue | 174 +++++++++++--
 src/views/statistics/statistics_guan.vue | 316 +++++++++++++++++------
 2 files changed, 383 insertions(+), 107 deletions(-)

diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index a45a1d30..aae95dfe 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -106,7 +106,7 @@
 						</el-table-column>
 						<el-table-column label="其他" class-name="colorheader2">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_qt }}</span>
+								<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'7车间') }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="出料" class-name="colorheader2">
@@ -138,7 +138,7 @@
 						</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>
+								<span v-if="scope.row.data.七车间入库_count&&scope.row.data.七车间入库_count_notok">{{ scope.row.data.七车间入库_count-scope.row.data.七车间入库_count_notok }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader3">
@@ -173,7 +173,7 @@
 						</el-table-column>
 						<el-table-column label="其他" class-name="colorheader3">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_qt }}</span>
+								<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'8车间') }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="交送人" class-name="colorheader3">
@@ -188,7 +188,7 @@
 						</el-table-column>
 						<el-table-column label="备注" class-name="colorheader3">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_备注 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_检验备注 }}</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
@@ -299,7 +299,7 @@
 							</el-table-column>
 							<el-table-column label="其他" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qt }}</span>
+									<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'粗中细磨') }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="加工日期" class-name="colorheader4">
@@ -317,47 +317,47 @@
 						<el-table-column label="抛光" class-name="colorheader4">
 							<el-table-column label="接收数" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_use }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_use }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_合格率 }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_合格率 }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="划伤" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hs }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_hs }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="断裂" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_dl }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="气泡" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qp }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_qp }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="其他" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qt }}</span>
+									<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'抛光') }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="不合格数" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_notok }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_notok }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="加工日期" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_日期 }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_日期 }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="操作人" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_操作人 }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_操作人 }}</span>
 								</template>
 							</el-table-column>
 						</el-table-column>
@@ -438,7 +438,7 @@
 							</el-table-column>
 							<el-table-column label="其他" class-name="colorheader4">
 									<template #default="scope">
-										<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qt }}</span>
+										<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间中检') }}</span>
 									</template>
 							</el-table-column>
 							<el-table-column label="日期" class-name="colorheader4">
@@ -448,7 +448,7 @@
 							</el-table-column>
 							<el-table-column label="操作人" class-name="colorheader4">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_操作人 }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_检验人 }}</span>
 								</template>
 							</el-table-column>
 						</el-table-column>
@@ -456,63 +456,63 @@
 					<el-table-column label="技术质量" align="center" class-name="colorheader5">
 						<el-table-column label="终检" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="不合格数" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_notok }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_notok }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="皮" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_p }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_yp }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="短" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_d }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_d }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="划伤" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_hs }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="炸纹" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_zw }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_zw }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="其他" class-name="colorheader5">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
+									<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间生产入库') }}</span>
 								</template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_合格率 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="日期" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_检验日期 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="检验人" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_操作人 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_检验人 }}</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="6号领取加工-发货合格率" class-name="colorheader6">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_批次生产合格率 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_批次发货合格率 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="7号生产-发货合格率" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.七车间_批次应出合格率 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.七车间_批次发货合格率 }}</span>
 						</template>
 					</el-table-column>
 				</scTable>
@@ -546,6 +546,124 @@ export default {
 		handleQuery(){
 			this.$refs.table.queryData(this.query);
 		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		    if(type=='7车间'){
+				if(data.棒料成型_count_notok){
+					if (data.棒料成型_count_n_zw !== undefined) {
+						count += data.棒料成型_count_n_zw ;
+					}
+					if (data.棒料成型_count_n_zt !== undefined) {
+						count += data.棒料成型_count_n_zt ;
+					}
+					if (data.棒料成型_count_n_tw !== undefined) {
+						count += data.棒料成型_count_n_tw ;
+					}
+					if (data.棒料成型_count_n_qp !== undefined) {
+						count += data.棒料成型_count_n_qp ;
+					}
+					if (data.棒料成型_count_n_zz !== undefined) {
+						count += data.棒料成型_count_n_zz ;
+					}
+					if (data.棒料成型_count_n_b !== undefined) {
+						count += data.棒料成型_count_n_b ;
+					}
+					count_qt = data.棒料成型_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='8车间'){
+				if(data.七车间入库_count_notok){
+					if (data.七车间入库_count_n_zw !== undefined) {
+						count += data.七车间入库_count_n_zw ;
+					}
+					if (data.七车间入库_count_n_zt !== undefined) {
+						count += data.七车间入库_count_n_zt ;
+					}
+					if (data.七车间入库_count_n_tw !== undefined) {
+						count += data.七车间入库_count_n_tw ;
+					}
+					if (data.七车间入库_count_n_qp !== undefined) {
+						count += data.七车间入库_count_n_qp ;
+					}
+					if (data.七车间入库_count_n_b !== undefined) {
+						count += data.七车间入库_count_n_b ;
+					}
+					count_qt = data.七车间入库_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='粗中细磨'){
+				if(data.六车间_粗中细磨_count_notok){
+					if (data.六车间_粗中细磨_count_n_d !== undefined) {
+						count += data.六车间_粗中细磨_count_n_d ;
+					}
+					if (data.六车间_粗中细磨_count_n_w !== undefined) {
+						count += data.六车间_粗中细磨_count_n_w ;
+					}
+					if (data.六车间_粗中细磨_count_n_yp !== undefined) {
+						count += data.六车间_粗中细磨_count_n_yp ;
+					}
+					if (data.六车间_粗中细磨_count_n_dl !== undefined) {
+						count += data.六车间_粗中细磨_count_n_dl ;
+					}
+					count_qt = data.六车间_粗中细磨_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='抛光'){
+				if(data.六车间_抛光_count_notok){
+					if (data.六车间_抛光_count_n_hs !== undefined) {
+						count += data.六车间_抛光_count_n_hs ;
+					}
+					if (data.六车间_抛光_count_n_dl !== undefined) {
+						count += data.六车间_抛光_count_n_dl ;
+					}
+					if (data.六车间_抛光_count_n_qp !== undefined) {
+						count += data.六车间_抛光_count_n_qp ;
+					}
+					count_qt = data.六车间_抛光_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='六车间中检'){
+				if(data.六车间中检_count_notok){
+					if (data.六车间中检_count_n_hs !== undefined) {
+						count += data.六车间中检_count_n_hs ;
+					}
+					if (data.六车间中检_count_n_zw !== undefined) {
+						count += data.六车间中检_count_n_zw ;
+					}
+					if (data.六车间中检_count_n_zdd !== undefined) {
+						count += data.六车间中检_count_n_zdd ;
+					}
+					if (data.六车间中检_count_n_qp !== undefined) {
+						count += data.六车间中检_count_n_qp ;
+					}
+					if (data.六车间中检_count_n_bl !== undefined) {
+						count += data.六车间中检_count_n_bl ;
+					}
+					if (data.六车间中检_count_n_qx !== undefined) {
+						count += data.六车间中检_count_n_qx ;
+					}
+					count_qt = data.六车间中检_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='六车间生产入库'){
+				if(data.六车间生产入库_count_notok){
+					if (data.六车间生产入库_count_n_yp !== undefined) {
+						count += data.六车间生产入库_count_n_yp ;
+					}
+					if (data.六车间生产入库_count_n_d !== undefined) {
+						count += data.六车间生产入库_count_n_d ;
+					}
+					if (data.六车间生产入库_count_n_hs !== undefined) {
+						count += data.六车间生产入库_count_n_hs ;
+					}
+					if (data.六车间生产入库_count_n_zw !== undefined) {
+						count += data.六车间生产入库_count_n_zw ;
+					}
+					count_qt = data.六车间生产入库_count_notok - count;
+					return count_qt;
+				}
+			}
+		}
 	},
 };
 </script>
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 03659d9f..c672a35e 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -112,7 +112,7 @@
 					</el-table-column>
 					<el-table-column label="其他" class-name="colorheader1">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_qt }}</span>
+							<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'管料成型') }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="备注" class-name="colorheader1">
@@ -179,7 +179,7 @@
 					</el-table-column>
 					<el-table-column label="其他" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qt }}</span>
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'十车间入库')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="抽检人" class-name="colorheader2">
@@ -188,7 +188,69 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="8号入库" align="center" class-name="colorheader3">
+				<el-table-column label="退火" align="center" class-name="colorheader4">
+					<el-table-column label="时间" width="100px" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_日期 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="退火数" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_use }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="合格数" class-name="colorheader4">
+						<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="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_合格率 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="不合格数" class-name="colorheader4">
+						<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="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_xzp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="退火后碎" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_thhs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="划伤" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_hs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="结石" class-name="colorheader4">
+						<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="colorheader4">
+						<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="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'管料退火')}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="退火人" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_操作人 }}</span>
+						</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>
@@ -251,7 +313,7 @@
 					</el-table-column>
 					<el-table-column label="其他" class-name="colorheader3">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qt }}</span>
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'十车间入库')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="备注" class-name="colorheader3">
@@ -262,69 +324,7 @@
 					<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="colorheader4">
-					<el-table-column label="时间" width="100px" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_日期 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="退火数" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_use }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader4">
-						<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="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_合格率 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格数" class-name="colorheader4">
-						<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="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_xzp }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="退火后碎" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_thhs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="划伤" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_hs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结石" class-name="colorheader4">
-						<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="colorheader4">
-						<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="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_qt }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="退火人" class-name="colorheader4">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_操作人 }}</span>
-						</template>
-					</el-table-column>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column label="6号车间" align="center" class-name="colorheader5">
 					<el-table-column label="领料" align="center" class-name="colorheader5">
 						<el-table-column label="领取时间" width="100px" class-name="colorheader5">
@@ -376,7 +376,7 @@
 						</el-table-column>
 						<el-table-column label="其他" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qt }}</span>
+								<span v-if="scope.row.data">{{getCountQt(scope.row.data,'开槽')}}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期" width="100px" class-name="colorheader5">
@@ -418,7 +418,7 @@
 						</el-table-column>
 						<el-table-column label="其他" class-name="colorheader5">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qt }}</span>
+								<span v-if="scope.row.data">{{getCountQt(scope.row.data,'倒角')}}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期" width="100px" class-name="colorheader5">
@@ -497,7 +497,7 @@
 					</el-table-column>
 					<el-table-column label="其他" class-name="colorheader6">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qt }}</span>
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'六车间中检')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="日期" class-name="colorheader6">
@@ -514,48 +514,48 @@
 				<el-table-column label="终检" align="center" class-name="colorheader7">
 					<el-table-column label="终检数" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
+							<span v-if="scope.row.data&&scope.row.data.销售发货_count&&scope.row.data.六车间生产入库_count_notok">{{ scope.row.data.销售发货_count + scope.row.data.六车间生产入库_count_notok }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_合格率 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="不合格数" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_notok }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_notok }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="划伤" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_hs }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="炸纹" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_zw }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_n_zw }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="其他" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'六车间生产入库')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="日期" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_检验日期 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作人" class-name="colorheader7">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_检验人 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_检验人 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="领管-终检合格率">
 					<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_批次生产合格率 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.七车间_批次发货合格率 }}</span>
 						</template>
 				</el-table-column>
 			</scTable>
@@ -587,6 +587,164 @@ export default {
 		handleQuery(){
 			this.$refs.table.queryData(this.query);
 		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		    if(type=='管料成型'){
+				if(data.管料成型_count_notok){
+					if (data.管料成型_count_n_wq !== undefined) {
+						count += data.管料成型_count_n_wq ;
+					}
+					if (data.管料成型_count_n_tw !== undefined) {
+						count += data.管料成型_count_n_tw ;
+					}
+					if (data.管料成型_count_n_dl !== undefined) {
+						count += data.管料成型_count_n_dl ;
+					}
+					if (data.管料成型_count_n_pb !== undefined) {
+						count += data.管料成型_count_n_pb ;
+					}
+					if (data.管料成型_count_n_dxt !== undefined) {
+						count += data.管料成型_count_n_dxt ;
+					}
+					if (data.管料成型_count_n_js !== undefined) {
+						count += data.管料成型_count_n_js ;
+					}
+					if (data.管料成型_count_n_qx !== undefined) {
+						count += data.管料成型_count_n_qx ;
+					}
+					count_qt = data.管料成型_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='十车间入库'){
+				if(data.十车间入库_count_notok){
+					if (data.十车间入库_count_n_wq !== undefined) {
+						count += data.十车间入库_count_n_wq ;
+					}
+					if (data.十车间入库_count_n_tw !== undefined) {
+						count += data.十车间入库_count_n_tw ;
+					}
+					if (data.十车间入库_count_n_dl !== undefined) {
+						count += data.十车间入库_count_n_dl ;
+					}
+					if (data.十车间入库_count_n_pb !== undefined) {
+						count += data.十车间入库_count_n_pb ;
+					}
+					if (data.十车间入库_count_n_dxt !== undefined) {
+						count += data.十车间入库_count_n_dxt ;
+					}
+					if (data.十车间入库_count_n_js !== undefined) {
+						count += data.十车间入库_count_n_js ;
+					}
+					if (data.十车间入库_count_n_qx !== undefined) {
+						count += data.十车间入库_count_n_qx ;
+					}
+					count_qt = data.十车间入库_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='十车间入库'){
+				if(data.十车间入库_count_notok){
+					if (data.十车间入库_count_n_wq !== undefined) {
+						count += data.十车间入库_count_n_wq ;
+					}
+					if (data.十车间入库_count_n_tw !== undefined) {
+						count += data.十车间入库_count_n_tw ;
+					}
+					if (data.十车间入库_count_n_dl !== undefined) {
+						count += data.十车间入库_count_n_dl ;
+					}
+					if (data.十车间入库_count_n_pb !== undefined) {
+						count += data.十车间入库_count_n_pb ;
+					}
+					if (data.十车间入库_count_n_dxt !== undefined) {
+						count += data.十车间入库_count_n_dxt ;
+					}
+					if (data.十车间入库_count_n_js !== undefined) {
+						count += data.十车间入库_count_n_js ;
+					}
+					if (data.十车间入库_count_n_qx !== undefined) {
+						count += data.十车间入库_count_n_qx ;
+					}
+					count_qt = data.十车间入库_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='管料退火'){
+				if(data.管料退火_count_notok){
+					if (data.管料退火_count_n_xzp !== undefined) {
+						count += data.管料退火_count_n_xzp ;
+					}
+					if (data.管料退火_count_n_thhs !== undefined) {
+						count += data.管料退火_count_n_thhs ;
+					}
+					if (data.管料退火_count_n_hs !== undefined) {
+						count += data.管料退火_count_n_hs ;
+					}
+					if (data.管料退火_count_n_js !== undefined) {
+						count += data.管料退火_count_n_js ;
+					}
+					if (data.管料退火_count_n_qx !== undefined) {
+						count += data.管料退火_count_n_qx ;
+					}
+					count_qt = data.管料退火_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='开槽'){
+				if(data.六车间_开槽_count_notok){
+					if (data.六车间_开槽_count_n_dl !== undefined) {
+						count += data.六车间_开槽_count_n_dl ;
+					}
+					count_qt = data.六车间_开槽_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='倒角'){
+				if(data.六车间_倒角_count_notok){
+					if (data.六车间_倒角_count_n_dl !== undefined) {
+						count += data.六车间_倒角_count_n_dl ;
+					}
+					count_qt = data.六车间_倒角_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='六车间中检'){
+				if(data.六车间中检_count_notok){
+					if (data.六车间中检_count_n_hs !== undefined) {
+						count += data.六车间中检_count_n_hs ;
+					}
+					if (data.六车间中检_count_n_zz !== undefined) {
+						count += data.六车间中检_count_n_zz ;
+					}
+					if (data.六车间中检_count_n_zdd !== undefined) {
+						count += data.六车间中检_count_n_zdd ;
+					}
+					if (data.六车间中检_count_n_zw !== undefined) {
+						count += data.六车间中检_count_n_zw ;
+					}
+					if (data.六车间中检_count_n_qp !== undefined) {
+						count += data.六车间中检_count_n_qp ;
+					}
+					if (data.六车间中检_count_n_bl !== undefined) {
+						count += data.六车间中检_count_n_bl ;
+					}
+					if (data.六车间中检_count_n_hw !== undefined) {
+						count += data.六车间中检_count_n_hw ;
+					}
+					if (data.六车间中检_count_n_yp !== undefined) {
+						count += data.六车间中检_count_n_yp ;
+					}
+					count_qt = data.六车间中检_count_notok - count;
+					return count_qt;
+				}
+			}else if(type=='六车间生产入库'){
+				if(data.六车间生产入库_count_notok){
+					if (data.六车间生产入库_count_n_hs !== undefined) {
+						count += data.六车间生产入库_count_n_hs ;
+					}
+					if (data.六车间生产入库_count_n_zw !== undefined) {
+						count += data.六车间生产入库_count_n_zw ;
+					}
+					count_qt = data.六车间生产入库_count_notok - count;
+					return count_qt;
+				}
+			}
+		}
 	},
 };
 </script>