From eacbfea37527ca785b34faf0e549c3d3c40fb352 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 15 Jul 2025 15:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/statistics_bang.vue | 50 +++++++++++-------------
 src/views/statistics/statistics_guan.vue | 39 +++++++-----------
 2 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index 11215941..4bc578ad 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -43,7 +43,7 @@
 				ref="table"
 				:apiObj="apiObj"
 				:params="params"
-				:query="query"
+				:query="params"
 				id="exportDiv"
 				stripe
 				>
@@ -459,6 +459,11 @@
 								<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.六车间生产入库_count_notok }}</span>
@@ -489,11 +494,6 @@
 									<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>
-							</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>
@@ -505,6 +505,11 @@
 							</template>
 						</el-table-column>
 					</el-table-column>
+					<el-table-column label="发货检验数" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="6号领取加工-发货合格率" class-name="colorheader6">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_批次发货合格率 }}</span>
@@ -529,16 +534,15 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'-last_time,-first_time',
-				material_start__cate:'棒',
-				last_time_isnull:false,
+				ordering:'-data__棒料成型_小日期',
+				querys : [[{field:"data__has_key",compare:"",value:"棒料成型_日期"}]]
 			},
 			query:{
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
 			},
-			apiObj: this.$API.wpm.batchst,
+			apiObj: this.$API.wpm.batchstquery,
 			options:[],
 			tableData:[],
 		};
@@ -546,33 +550,25 @@ export default {
 	methods: {
 		handleQuery(){
 			let that = this;
-			let querys = [],arr1=[],arr2=[];
+			let querys = [[{field:"data__has_key",compare:"",value:"棒料成型_日期"}],];
 			let obj = {},obj1 = {},obj2 = {};
 			obj.field = 'batch__contains';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-			obj1.field = 'last_time__gte';
+			obj1.field = 'last_time';
 			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);
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys[0].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)
+				querys[0].push(obj1);
 			}
 			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)
+				querys[0].push(obj2);
 			}
 			let params = {};
 			params.querys = querys;
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 2e8732b0..da839b9c 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -43,7 +43,7 @@
 				ref="table"
 				:apiObj="apiObj"
 				:params="params"
-				:query="query"
+				:query="params"
 				id="exportDiv"
 				stripe
 			>
@@ -129,12 +129,12 @@
 					</el-table-column>
 					<el-table-column label="合格数" class-name="colorheader2">
 						<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="colorheader2">
 						<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="colorheader2">
@@ -591,9 +591,8 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'-last_time',
-				material_start__cate:'管',
-				last_time_isnull:false,
+				ordering:'-data__管料成型_小日期',
+				querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]]
 			},
 			query:{
 				batch__contains:'',
@@ -601,7 +600,7 @@ export default {
 				last_time__lte:'',
 				
 			},
-			apiObj: this.$API.wpm.batchst,
+			apiObj: this.$API.wpm.batchstquery,
 			options:[],
 			tableData:[],
 		};
@@ -609,33 +608,25 @@ export default {
 	methods: {
 		handleQuery(){
 			let that = this;
-			let querys = [],arr1=[],arr2=[];
+			let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]];
 			let obj = {},obj1 = {},obj2 = {};
 			obj.field = 'batch__contains';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-			obj1.field = 'last_time__gte';
+			obj1.field = 'last_time';
 			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);
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
+				querys[0].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)
+				querys[0].push(obj1);
 			}
 			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)
+				querys[0].push(obj2);
 			}
 			let params = {};
 			params.querys = querys;