From f798a0fa02b68dc6f17401f970b3cfa22120bc56 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 13 Jan 2026 15:09:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A3=80=E6=B5=8B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=AE=B5=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=97=A5=E6=9C=9F=E5=92=8C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/cpccjc.vue     | 23 ++++++++-
 src/views/statistics/bxerp/cpwgfj1.vue    | 23 ++++++++-
 src/views/statistics/bxerp/cpwgfj2.vue    | 13 +++--
 src/views/statistics/bxerp/cpwgnzcj.vue   | 23 ++++++++-
 src/views/statistics/bxerp/cpwgnzfj.vue   | 23 ++++++++-
 src/views/statistics/bxerp/cpxnjy.vue     | 23 ++++++++-
 src/views/statistics/bxerp/cpzj.vue       | 23 ++++++++-
 src/views/statistics/bxerp/fenjian.vue    | 23 ++++++++-
 src/views/statistics/bxerp/gzcpjc.vue     | 23 ++++++++-
 src/views/statistics/bxerp/maopi.vue      | 63 +++++++++++++++--------
 src/views/statistics/bxerp/niuzhuan.vue   | 25 +++++++--
 src/views/statistics/bxerp/zhongjian1.vue | 23 ++++++++-
 src/views/statistics/bxerp/zhongjian2.vue |  5 ++
 13 files changed, 266 insertions(+), 47 deletions(-)

diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue
index 91b30113..2b7c223a 100644
--- a/src/views/statistics/bxerp/cpccjc.vue
+++ b/src/views/statistics/bxerp/cpccjc.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品尺寸检测_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="倒角" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_缺陷项_倒角==undefined?scope.row.data.成品尺寸检测_缺陷项_倒角:0 }}</span>
@@ -116,11 +135,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品尺寸检测_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品尺寸检测_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpwgfj1.vue b/src/views/statistics/bxerp/cpwgfj1.vue
index bf2d25a3..8908a17a 100644
--- a/src/views/statistics/bxerp/cpwgfj1.vue
+++ b/src/views/statistics/bxerp/cpwgfj1.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品外观复检一_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="划伤" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检一_缺陷项_划伤? scope.row.data.成品外观复检一_缺陷项_划伤:0 }}</span>
@@ -236,11 +255,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品外观复检一_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品外观复检一_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue
index f7bd8525..14862c22 100644
--- a/src/views/statistics/bxerp/cpwgfj2.vue
+++ b/src/views/statistics/bxerp/cpwgfj2.vue
@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				 <!-- <el-date-picker
+				 <el-date-picker
 					v-model="query.last_time__gte"
 					type="date"
 					value-format="YYYY-MM-DD"
@@ -15,7 +15,7 @@
 					value-format="YYYY-MM-DD"
 					placeholder="结束时间"
 					style="margin-left: 2px; width: 150px"
-				/> -->
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -56,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品外观复检二_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="划伤" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检二_缺陷项_划伤? scope.row.data.成品外观复检二_缺陷项_划伤:0 }}</span>
@@ -250,11 +255,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品外观复检二_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品外观复检二_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue
index 6e5081f3..b9d4608b 100644
--- a/src/views/statistics/bxerp/cpwgnzcj.vue
+++ b/src/views/statistics/bxerp/cpwgnzcj.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品内外初检_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内外初检_缺陷项_毛坯长点?scope.row.data.成品内外初检_缺陷项_毛坯长点:0 }}</span>
@@ -241,11 +260,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品内外初检_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品内外初检_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpwgnzfj.vue b/src/views/statistics/bxerp/cpwgnzfj.vue
index e6c2d060..e9b84fa5 100644
--- a/src/views/statistics/bxerp/cpwgnzfj.vue
+++ b/src/views/statistics/bxerp/cpwgnzfj.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品内质复检_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="毛坯长点" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品内质复检_缺陷项_毛坯长点?scope.row.data.成品内质复检_缺陷项_毛坯长点:0 }}</span>
@@ -236,11 +255,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品内外初检_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品内外初检_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue
index 25abb54f..07f18cce 100644
--- a/src/views/statistics/bxerp/cpxnjy.vue
+++ b/src/views/statistics/bxerp/cpxnjy.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品性能检测_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="剪切" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品性能检测_缺陷项_剪切?scope.row.data.成品性能检测_缺陷项_剪切:0 }}</span>
@@ -146,11 +165,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品性能检测_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品性能检测_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue
index a9510b86..5f178c77 100644
--- a/src/views/statistics/bxerp/cpzj.vue
+++ b/src/views/statistics/bxerp/cpzj.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.成品自检_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="腐蚀" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品自检_缺陷项_腐蚀?scope.row.data.成品自检_缺陷项_腐蚀:0 }}</span>
@@ -176,11 +195,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__成品自检_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__成品自检_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue
index 419507cd..35a2ec13 100644
--- a/src/views/statistics/bxerp/fenjian.vue
+++ b/src/views/statistics/bxerp/fenjian.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.分检_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="S畸变" align="center" class-name="colorheader1">
 					<el-table-column label="差值" class-name="colorheader1">
 						<template #default="scope">
@@ -125,11 +144,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__分检_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__分检_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/gzcpjc.vue b/src/views/statistics/bxerp/gzcpjc.vue
index 827109a1..bedcb7d9 100644
--- a/src/views/statistics/bxerp/gzcpjc.vue
+++ b/src/views/statistics/bxerp/gzcpjc.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.光锥成品检测_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="放大率" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.光锥成品检测_缺陷项_放大率?scope.row.data.光锥成品检测_缺陷项_放大率:0 }}</span>
@@ -121,11 +140,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__光锥成品检测_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__光锥成品检测_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index 40f7c8a5..231fe1c7 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -41,6 +55,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.毛坯检测_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
 					<el-table-column label="差值" class-name="colorheader1">
 						<template #default="scope">
@@ -201,11 +220,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__毛坯检测_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__毛坯检测_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
@@ -241,64 +260,64 @@ export default {
 					return;
 				}
 				let propert = '';
-				if(index == 5&&column.label=='合格数'){
+				if(index == 6&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_放大率￠2mm不合格';
 				}
-				if(index == 7&&column.label=='合格数'){
+				if(index == 8&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_放大率￠16mm不合格';
 				}
-				if(index == 10&&column.label=='合格数'){
+				if(index == 11&&column.label=='合格数'){
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm不合格';
 				}
-				if(index == 11&&column.label=='可加工'){
+				if(index == 12&&column.label=='可加工'){
 					propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
 				}
-				if(index == 12&&column.label=='内标合格'){
+				if(index == 13&&column.label=='内标合格'){
 					propert= '毛坯检测_缺陷项_暗点合格';
 				}
-				if(index == 13&&column.label=='长点不合格'){
+				if(index == 14&&column.label=='长点不合格'){
 					propert= '毛坯检测_缺陷项_暗点不合格';
 				}
-				if(index == 14&&column.label=='可加工'){
+				if(index == 15&&column.label=='可加工'){
 					propert= '毛坯检测_缺陷项_暗点合格';
 				}
-				if(index == 15&&column.label=='暗点重'){
+				if(index == 16&&column.label=='暗点重'){
 					propert= '毛坯检测_缺陷项_暗点重';
 				}
-				if(index == 16&&column.label=='花丝'){
+				if(index == 17&&column.label=='花丝'){
 					propert= '毛坯检测_缺陷项_花丝';
 				}
-				if(index == 17&&column.label=='网格'){
+				if(index == 18&&column.label=='网格'){
 					propert= '毛坯检测_缺陷项_网格';
 				}
-				if(index == 18&&column.label=='轻'){
+				if(index == 19&&column.label=='轻'){
 					propert= '毛坯检测_缺陷项_花朵';
 				}
-				if(index == 19&&column.label=='重'){
+				if(index == 20&&column.label=='重'){
 					propert= '毛坯检测_缺陷项_花朵重';
 				}
-				if(index == 20&&column.label=='S畸变不合格'){
+				if(index == 21&&column.label=='S畸变不合格'){
 					propert= '毛坯检测_缺陷项_S畸变不合格';
 				}
-				if(index == 21&&column.label=='弓形畸变不合格'){
+				if(index == 22&&column.label=='弓形畸变不合格'){
 					propert= '毛坯检测_缺陷项_弓形畸变不合格';
 				}
-				if(index == 22&&column.label=='炸废'){
+				if(index == 23&&column.label=='炸废'){
 					propert= '毛坯检测_缺陷项_炸废';
 				}
-				if(index == 23&&column.label=='角偏'){
+				if(index == 24&&column.label=='角偏'){
 					propert= '毛坯检测_缺陷项_角偏';
 				}
-				if(index == 24&&column.label=='色差'){
+				if(index == 25&&column.label=='色差'){
 					propert= '毛坯检测_缺陷项_色差';
 				}
 				if (propert!=='') {
 					let values = [];
-					if(index==5||index==7){
+					if(index==6||index==8){
 						values = data.map((item) =>!item.data[propert]?1:0);
-					}else if(index==10){
+					}else if(index==11){
 						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0);
-					}else if(index==14){
+					}else if(index==15){
 						values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_暗点不合格']?1:0);
 					}else{
 						values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);
diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue
index caf89c64..6b033151 100644
--- a/src/views/statistics/bxerp/niuzhuan.vue
+++ b/src/views/statistics/bxerp/niuzhuan.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,7 +56,12 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
-				<el-table-column label="炉号" prop="number" fixed="left">
+				<el-table-column label="炉号" prop="" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.扭后检测_日期 }}
+					</template>
 				</el-table-column>
 				<el-table-column label="扭转角" align="center" class-name="colorheader1">
 					<el-table-column label="差值" class-name="colorheader1">
@@ -225,11 +244,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__扭后检测_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__扭后检测_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue
index c45d19ea..b7facfa1 100644
--- a/src/views/statistics/bxerp/zhongjian1.vue
+++ b/src/views/statistics/bxerp/zhongjian1.vue
@@ -2,6 +2,20 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
 				<el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
@@ -42,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.中检一_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="炸" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_炸?scope.row.data.中检一_缺陷项_炸:0 }}</span>
@@ -171,11 +190,11 @@ export default {
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
 
-			obj1.field = 'last_time';
+			obj1.field = 'data__中检一_日期';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'last_time';
+			obj2.field = 'data__中检一_日期';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue
index b36622bf..d2571f48 100644
--- a/src/views/statistics/bxerp/zhongjian2.vue
+++ b/src/views/statistics/bxerp/zhongjian2.vue
@@ -56,6 +56,11 @@
 				</el-table-column>
 				<el-table-column label="板号" prop="number" fixed="left">
 				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.中检二_日期 }}
+					</template>
+				</el-table-column>
 				<el-table-column label="炸废" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检二_缺陷项_炸废?scope.row.data.中检二_缺陷项_炸废:0 }}</span>