diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 6a3ed3fd..e627a5de 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -252,7 +252,7 @@
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="6号车间" align="center" class-name="colorheader4">
-					<el-table-column label="库存领料" align="center" class-name="colorheader4">
+					<!-- <el-table-column label="库存领料" align="center" class-name="colorheader4">
 						<el-table-column label="领取时间" width="160px" class-name="colorheader4">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间领料_日期 }}</span>
@@ -278,26 +278,71 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间领料_备注 }}</span>
 							</template>
 						</el-table-column>
-					</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="领取时间" width="160px" 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.六车间领料_日期 ">{{ scope.row.data.六车间领料_日期 }}</span>
+								<span v-if="scope.row.data&&scope.row.data.六车间领料_日期&&scope.row.data.六车间交接领料_日期">;</span>
+								<span v-if="scope.row.data&&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 }}</span>
+								<span v-if="scope.row.data&&scope.row.data.六车间领料_count">{{ scope.row.data.六车间领料_count + scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:0 }}</span>
+								<span v-else>{{  scope.row.data.六车间交接领料_count?scope.row.data.六车间交接领料_count:'' }}</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.六车间领料_仓库执行人?scope.row.data.六车间领料_仓库执行人:'' }}{{ 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.六车间领料_车间执行人?scope.row.data.六车间领料_车间执行人:'' }}{{ scope.row.data.六车间交接领料_接料人?scope.row.data.六车间交接领料_接料人:'' }}</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="工前检验" align="center" class-name="colorheader3">
+						<el-table-column label="加工数" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_count_real }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="合格率" class-name="colorheader3">
+							<template #default="scope">
+								<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="colorheader3">
+							<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="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_count_n_dl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="其他" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{getCountQt(scope.row.data,'工前检验')}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="加工日期"  min-width="160" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_日期 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="操作人" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_操作人 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="备注" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_工前检验_备注 }}</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
@@ -501,9 +546,14 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
+				<el-table-column label="仓库库存" class-name="colorheader7">
+					<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 }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="领管-终检合格率">
 					<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.销售发货_count+scope.row.data.六车间库存_count)/(scope.row.data.六车间领料_count+scope.row.data.六车间交接领料_count))*100).toFixed(2) }}%</span>
 						</template>
 				</el-table-column>
 				<el-table-column label="组合件批次号" min-width="160">
@@ -671,6 +721,14 @@ export default {
 					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) {