From 578c69b599a5dbfeacb4f10563225221992046d1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 4 Dec 2024 13:48:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5/=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/statistics_bang.vue |  3 ++-
 src/views/statistics/statistics_guan.vue | 26 ++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index 6bfa0c80..d15dab84 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -515,9 +515,10 @@ export default {
 		return {
 			params: {
 				ordering:'-last_time',
-				batch__contains:'ZJ2',
+				batch__startswith__in:'ZJ2,G05',
 			},
 			query:{
+				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
 			},
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index 67f1438d..0d2b54c3 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -9,18 +9,18 @@
 				></el-input>
 				<el-date-picker
 					v-model="query.last_time__gte"
-					type="date"
-					placeholder="开始日期"
-					value-format="YYYY-MM-DD"
+					type="datetime"
+					placeholder="开始时间"
+					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin: 5px"
 				>
 				</el-date-picker>
 				<el-date-picker
 					v-model="query.last_time__lte"
-					type="date"
-					placeholder="截止日期"
-					value-format="YYYY-MM-DD"
+					type="datetime"
+					placeholder="截止时间"
+					value-format="YYYY-MM-DD HH:mm:ss"
 					clearable
 					style="width: 200px; margin:0"
 				>
@@ -251,9 +251,12 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="备注">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_检验备注 }}</span>
+						</template>
 					</el-table-column>
 					<el-table-column label="接收人">
-						<template #default="scope">{{ scope.row.data.十车间入库_仓库执行人 }}</template>
+						<template #default="scope">{{ scope.row.data.十车间入库_备注 }}</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="退火" align="center">
@@ -367,9 +370,9 @@
 						</template>
 					</el-table-column>
 					<el-table-column label="备注">
-						<!-- <template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.备注 }}</span>
-						</template> -->
+						<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">
@@ -528,9 +531,10 @@ export default {
 		return {
 			params: {
 				ordering:'-last_time',
-				batch__contains:'ZB2',
+				batch__startswith__in:'ZB2',
 			},
 			query:{
+				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',