diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index 03faef88..4db1007e 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -390,62 +390,62 @@
 						<el-table-column label="检测" class-name="colorheader6">
 							<el-table-column label="接收数" class-name="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_real }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="合格率" class-name="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data&&(scope.row.data.六车间中检_合格率||scope.row.data.六车间中检_合格率==0)">{{ scope.row.data.六车间中检_合格率 }}%</span>
+									<span v-if="scope.row.data&&(scope.row.data.六车间_中检_合格率||scope.row.data.六车间_中检_合格率==0)">{{ scope.row.data.六车间_中检_合格率 }}%</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="不合格数" class-name="colorheader6">
 								<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="colorheader6">
 								<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="colorheader6">
 								<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="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_zdd }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="气泡" class-name="colorheader6">
 								<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="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_bl }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="气线" class-name="colorheader6">
 								<template #default="scope">
-									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
+									<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_qx }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="其他" class-name="colorheader6">
 									<template #default="scope">
-										<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间中检') }}</span>
+										<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间_中检') }}</span>
 									</template>
 							</el-table-column>
 							<el-table-column label="日期" class-name="colorheader6" min-width="160">
 								<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="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>
@@ -515,7 +515,7 @@
 					</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" style="word-break: break-all;">{{ scope.row.data.六车间生产入库_组合件_批次号 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="发货数" class-name="colorheader1">
@@ -525,12 +525,14 @@
 					</el-table-column>
 					<el-table-column label="6号领取加工-发货合格率" class-name="colorheader2">
 						<template #default="scope">
-							<span v-if="scope.row.data&&(scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0+scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0)>0">{{ scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0/(scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0+scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0)}}</span>
+							<span v-if="scope.row.data&&((scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0)+(scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0))>0">
+								{{ (((scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0)/(scope.row.data.六车间领料_count?scope.row.data.六车间领料_count:0+scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0))*100).toFixed(2)}}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="7号生产-发货合格率" class-name="colorheader3">
 						<template #default="scope">
-							<span v-if="scope.row.data&&scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0>0">{{ (scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0)/scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0}}</span>
+							<span v-if="(scope.row.data&&scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0)>0">
+								{{ (((scope.row.data.六车间生产入库_count?scope.row.data.六车间生产入库_count:0)/(scope.row.data.棒料成型_count_ok?scope.row.data.棒料成型_count_ok:0))*100).toFixed(2)}}%</span>
 						</template>
 					</el-table-column>
 				</scTable>
@@ -663,27 +665,27 @@ export default {
 					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 ;
+			}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_zw !== undefined) {
+						count += data.六车间_中检_count_n_zw ;
 					}
-					if (data.六车间中检_count_n_zdd !== undefined) {
-						count += data.六车间中检_count_n_zdd ;
+					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_qp !== undefined) {
+						count += data.六车间_中检_count_n_qp ;
 					}
-					if (data.六车间中检_count_n_bl !== undefined) {
-						count += data.六车间中检_count_n_bl ;
+					if (data.六车间_中检_count_n_bl !== undefined) {
+						count += data.六车间_中检_count_n_bl ;
 					}
-					if (data.六车间中检_count_n_qx !== undefined) {
-						count += data.六车间中检_count_n_qx ;
+					if (data.六车间_中检_count_n_qx !== undefined) {
+						count += data.六车间_中检_count_n_qx ;
 					}
-					count_qt = data.六车间中检_count_notok - count;
+					count_qt = data.六车间_中检_count_notok - count;
 					return count_qt;
 				}
 			}else if(type=='六车间生产入库'){
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index e627a5de..3fe3fbc0 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -435,72 +435,72 @@
 				<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.六车间中检_合格率||scope.row.data.六车间中检_合格率==0)">{{ scope.row.data.六车间中检_合格率 }}%</span>
+							<span v-if="scope.row.data&&(scope.row.data.六车间_中检_合格率||scope.row.data.六车间_中检_合格率==0)">{{ 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.六车间中检_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_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_zz }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_zz }}</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_zdd }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_zdd }}</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_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="colorheader5">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_bl }}</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_hw }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_中检_count_n_hw }}</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_yp }}</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">{{getCountQt(scope.row.data,'六车间中检')}}</span>
+							<span v-if="scope.row.data">{{getCountQt(scope.row.data,'六车间_中检')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="日期" class-name="colorheader5" min-width="160">
 						<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>
@@ -745,33 +745,33 @@ export default {
 					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 ;
+			}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_zz !== undefined) {
+						count += data.六车间_中检_count_n_zz ;
 					}
-					if (data.六车间中检_count_n_zdd !== undefined) {
-						count += data.六车间中检_count_n_zdd ;
+					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_zw !== undefined) {
+						count += data.六车间_中检_count_n_zw ;
 					}
-					if (data.六车间中检_count_n_qp !== undefined) {
-						count += data.六车间中检_count_n_qp ;
+					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_bl !== undefined) {
+						count += data.六车间_中检_count_n_bl ;
 					}
-					if (data.六车间中检_count_n_hw !== undefined) {
-						count += data.六车间中检_count_n_hw ;
+					if (data.六车间_中检_count_n_hw !== undefined) {
+						count += data.六车间_中检_count_n_hw ;
 					}
-					if (data.六车间中检_count_n_yp !== undefined) {
-						count += data.六车间中检_count_n_yp ;
+					if (data.六车间_中检_count_n_yp !== undefined) {
+						count += data.六车间_中检_count_n_yp ;
 					}
-					count_qt = data.六车间中检_count_notok - count;
+					count_qt = data.六车间_中检_count_notok - count;
 					return count_qt;
 				}
 			}else if(type=='六车间生产入库'){
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index e3e7a92a..bff636a2 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -318,12 +318,12 @@
 								</el-table-column>
 								<el-table-column label="数量" prop="count" width="80">
 								</el-table-column>
-								<el-table-column label="操作" fixed="right" align="right" width="55">
+								<!-- <el-table-column label="操作" fixed="right" align="right" width="55">
 									<template #default="scope">
 										<el-link link type="primary" @click.stop="inm_test(scope.row)" v-auth="'ftestwork.create'">检验</el-link>
 										<el-link link type="success" @click.stop="inm_record(scope.row)">记录</el-link>
 									</template>
-								</el-table-column>
+								</el-table-column> -->
 							</scTable>
 						</el-main>
 					</el-container>