diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index 8eecf8de..11215941 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -138,7 +138,7 @@
 						</el-table-column>
 						<el-table-column label="合格数" class-name="colorheader3">
 							<template #default="scope">
-								<span v-if="scope.row.data.七车间入库_count&&scope.row.data.七车间入库_count_notok">{{ scope.row.data.七车间入库_count-scope.row.data.七车间入库_count_notok }}</span>
+								<span v-if="scope.row.data.七车间入库_count">{{ scope.row.data.七车间入库_count-scope.row.data.七车间入库_count_notok }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="合格率" class-name="colorheader3">
@@ -320,6 +320,11 @@
 									<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_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>
@@ -345,11 +350,6 @@
 									<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>
-								</template>
-							</el-table-column>
 							<el-table-column label="加工日期" class-name="colorheader4" min-width="160">
 								<template #default="scope">
 									<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_日期 }}</span>
@@ -529,8 +529,9 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'-last_time',
-				batch__startswith__in:'ZJ2,G05,J2C,A55',
+				ordering:'-last_time,-first_time',
+				material_start__cate:'棒',
+				last_time_isnull:false,
 			},
 			query:{
 				batch__contains:'',
@@ -544,7 +545,38 @@ export default {
 	},
 	methods: {
 		handleQuery(){
-			this.$refs.table.queryData(this.query);
+			let that = this;
+			let querys = [],arr1=[],arr2=[];
+			let obj = {},obj1 = {},obj2 = {};
+			obj.field = 'batch__contains';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+			obj1.field = 'last_time__gte';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+			obj2.field = 'last_time__gte';
+			obj2.value = that.query.last_time__gte;
+			obj2.compare = 'gte';
+			if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys.push(obj);
+			}
+			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
+				arr1.push(obj1);
+				if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+					arr1.push(obj);
+				}
+				querys.push(arr1)
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				arr2.push(obj2);
+				if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+					arr2.push(obj);
+				}
+				querys.push(arr2)
+			}
+			let params = {};
+			params.querys = querys;
+			this.$refs.table.queryData(params);
 		},
 		getCountQt(data,type){
 			let count_qt = 0,count = 0;
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 8ccc0bac..fa8d100f 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -188,69 +188,7 @@
 						</template>
 					</el-table-column>
 				</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>
-						</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="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>
@@ -324,9 +262,71 @@
 					<el-table-column label="接收人" class-name="colorheader3">
 						<template #default="scope">{{ scope.row.data.十车间入库_备注 }}</template>
 					</el-table-column>
-				</el-table-column> -->
+				</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>
+						</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="6号车间" align="center" class-name="colorheader5">
-					<el-table-column label="领料" align="center" class-name="colorheader5">
+					<el-table-column label="库存领料" align="center" class-name="colorheader5">
 						<el-table-column label="领取时间" width="160px" class-name="colorheader5">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间领料_日期 }}</span>
@@ -353,6 +353,28 @@
 							</template>
 						</el-table-column>
 					</el-table-column>
+					<el-table-column label="交接领料" align="center" class-name="colorheader5">
+						<el-table-column label="领取时间" width="160px" class-name="colorheader5">
+							<template #default="scope">
+								<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.六车间交接领料_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.六车间交接领料_送料人 }}</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>
+							</template>
+						</el-table-column>
+					</el-table-column>
 					<el-table-column label="开槽" align="center" class-name="colorheader5">
 						<el-table-column label="加工数" class-name="colorheader5">
 							<template #default="scope">
@@ -439,7 +461,7 @@
 					</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="检验" class-name="colorheader6">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count }}</span>
@@ -514,32 +536,32 @@
 				<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&&scope.row.data.六车间生产入库_count_notok">{{ scope.row.data.销售发货_count + scope.row.data.六车间生产入库_count_notok }}</span>
+							<span v-if="scope.row.data&&scope.row.data.销售发货_count">{{ 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.六车间生产入库_检验日期!==''">{{ 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.六车间生产入库_检验日期!==''">{{ 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.六车间生产入库_检验日期!==''">{{ 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.六车间生产入库_检验日期!==''">{{ 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">{{getCountQt(scope.row.data,'六车间生产入库')}}</span>
+							<span v-if="scope.row.data&&scope.row.data.六车间生产入库_检验日期!==''">{{getCountQt(scope.row.data,'六车间生产入库')}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="日期" class-name="colorheader7" min-width="160">
@@ -549,7 +571,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&&scope.row.data.六车间生产入库_检验日期!==''">{{ scope.row.data.六车间生产入库_检验人 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -570,7 +592,8 @@ export default {
 		return {
 			params: {
 				ordering:'-last_time',
-				batch__startswith__in:'ZB2,B1',
+				material_start__cate:'管',
+				last_time_isnull:false,
 			},
 			query:{
 				batch__contains:'',
@@ -585,7 +608,38 @@ export default {
 	},
 	methods: {
 		handleQuery(){
-			this.$refs.table.queryData(this.query);
+			let that = this;
+			let querys = [],arr1=[],arr2=[];
+			let obj = {},obj1 = {},obj2 = {};
+			obj.field = 'batch__contains';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+			obj1.field = 'last_time__gte';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+			obj2.field = 'last_time__gte';
+			obj2.value = that.query.last_time__gte;
+			obj2.compare = 'gte';
+			if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys.push(obj);
+			}
+			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
+				arr1.push(obj1);
+				if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+					arr1.push(obj);
+				}
+				querys.push(arr1)
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				arr2.push(obj2);
+				if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+					arr2.push(obj);
+				}
+				querys.push(arr2)
+			}
+			let params = {};
+			params.querys = querys;
+			this.$refs.table.queryData(params);
 		},
 		getCountQt(data,type){
 			let count_qt = 0,count = 0;
diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 35b84f80..07b11023 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -46,7 +46,6 @@
 						:filters="nameFilters1"
 						:filter-method="filterName1"
 						filter-placement="bottom-end"/>
-						<!-- 光芯不要这两列 -->
 						<el-table-column label="型号" prop="material_model" 
 						:filters="modelFilters1"
 						:filter-method="filterModel1"
@@ -55,7 +54,6 @@
 						:filters="specsFilters1"
 						:filter-method="filterSpecs1"
 						filter-placement="bottom-end"/>
-						<!-- 光芯不要这两列 -->
 						<el-table-column prop="dept_name" label="完成车间" 
 						:filters="deptFilters1"
 						:filter-method="filterDept1"
@@ -77,18 +75,14 @@
 						:filters="nameFilters11"
 						:filter-method="filterName11"
 						filter-placement="bottom-end"/>
-						<!-- 光芯不要这两列 -->
 						<el-table-column label="型号" prop="model" 
-						v-if="project_code!=='gx'"
 						:filters="modelFilters11"
 						:filter-method="filterModel11"
 						filter-placement="bottom-end"/>
 						<el-table-column label="规格" prop="specification" 
-						v-if="project_code!=='gx'"
 						:filters="specsFilters11"
 						:filter-method="filterSpecs11"
 						filter-placement="bottom-end"/>
-						<!-- 光芯不要这两列 -->
 						<el-table-column label="库存总数" prop="count_mb"/>
 						<el-table-column label="周预估值" v-if="params.type == 30">
 							<template #default="scope">
@@ -266,7 +260,6 @@ export default {
 				{ id: 40, name: "辅助材料" },
 				{ id: 70, name: "办公用品" },
 			],
-			project_code : this.$TOOL.data.get("BASE_INFO").base.base_code,
 		};
 	},
 	mounted() {
@@ -460,19 +453,10 @@ export default {
 				if (that.queryDate !== "" && that.queryDate !== null) {
 					that.start_date = that.queryDate + "-01";
 					let arr = that.queryDate.split("-");
-					that.end_date =
-						that.queryDate +
-						"-" +
-						new Date(arr[0], arr[1], 0).getDate();
+					that.end_date = that.queryDate + "-" + new Date(arr[0], arr[1], 0).getDate();
 				} else {
-					that.start_date =
-						that.currentYear + "-" + this.currentMonth + "-01";
-					that.end_date =
-						that.currentYear +
-						"-" +
-						this.currentMonth +
-						"-" +
-						that.currentLastDay;
+					that.start_date = that.currentYear + "-" + this.currentMonth + "-01";
+					that.end_date = that.currentYear + "-" + this.currentMonth + "-" + that.currentLastDay;
 				}
 			} else {
 				if (this.queryDate !== "" && this.queryDate !== null) {