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

---
 src/views/statistics/bxerp/cpccjc.vue     | 20 ++++++++++++++------
 src/views/statistics/bxerp/cpwgfj1.vue    | 20 ++++++++++++++------
 src/views/statistics/bxerp/cpwgfj2.vue    | 20 ++++++++++++++------
 src/views/statistics/bxerp/cpwgnzcj.vue   | 21 +++++++++++++++------
 src/views/statistics/bxerp/cpxnjy.vue     | 20 ++++++++++++++------
 src/views/statistics/bxerp/cpzj.vue       | 20 ++++++++++++++------
 src/views/statistics/bxerp/fenjian.vue    | 20 ++++++++++++++------
 src/views/statistics/bxerp/maopi.vue      | 21 +++++++++++++++------
 src/views/statistics/bxerp/niuzhuan.vue   | 20 ++++++++++++++------
 src/views/statistics/bxerp/zhongjian1.vue | 20 ++++++++++++++------
 src/views/statistics/bxerp/zhongjian2.vue | 20 ++++++++++++++------
 11 files changed, 156 insertions(+), 66 deletions(-)

diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue
index 78513dd7..423eba9e 100644
--- a/src/views/statistics/bxerp/cpccjc.vue
+++ b/src/views/statistics/bxerp/cpccjc.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -92,6 +92,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -105,19 +106,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品尺寸检测_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品尺寸检测_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -127,6 +132,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/cpwgfj1.vue b/src/views/statistics/bxerp/cpwgfj1.vue
index 6b508d2b..e08ca91c 100644
--- a/src/views/statistics/bxerp/cpwgfj1.vue
+++ b/src/views/statistics/bxerp/cpwgfj1.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -122,6 +122,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -135,19 +136,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品外观复检一_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品外观复检一_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -157,6 +162,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/cpwgfj2.vue b/src/views/statistics/bxerp/cpwgfj2.vue
index 9322b664..716d42d8 100644
--- a/src/views/statistics/bxerp/cpwgfj2.vue
+++ b/src/views/statistics/bxerp/cpwgfj2.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -122,6 +122,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -135,19 +136,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3={};
+			obj.field = 'data__成品外观复检二_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品外观复检二_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -157,6 +162,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/cpwgnzcj.vue b/src/views/statistics/bxerp/cpwgnzcj.vue
index b28bd749..ec2b4f24 100644
--- a/src/views/statistics/bxerp/cpwgnzcj.vue
+++ b/src/views/statistics/bxerp/cpwgnzcj.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -212,6 +212,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -225,19 +226,24 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品内外初检_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品内外初检_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -247,6 +253,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/cpxnjy.vue b/src/views/statistics/bxerp/cpxnjy.vue
index 15767f7e..ad26020a 100644
--- a/src/views/statistics/bxerp/cpxnjy.vue
+++ b/src/views/statistics/bxerp/cpxnjy.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -132,6 +132,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -145,19 +146,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品性能检测_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品性能检测_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -167,6 +172,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/cpzj.vue b/src/views/statistics/bxerp/cpzj.vue
index 6e057db6..87ee2c60 100644
--- a/src/views/statistics/bxerp/cpzj.vue
+++ b/src/views/statistics/bxerp/cpzj.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -172,6 +172,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -185,19 +186,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品自检_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__成品自检_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -207,6 +212,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/fenjian.vue b/src/views/statistics/bxerp/fenjian.vue
index 9ecbab69..5090c7dc 100644
--- a/src/views/statistics/bxerp/fenjian.vue
+++ b/src/views/statistics/bxerp/fenjian.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -106,6 +106,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -119,19 +120,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__分检_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__分检_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -141,6 +146,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/maopi.vue b/src/views/statistics/bxerp/maopi.vue
index 9b1ed6d5..fb660a3c 100644
--- a/src/views/statistics/bxerp/maopi.vue
+++ b/src/views/statistics/bxerp/maopi.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.name__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -180,10 +180,12 @@ export default {
 	data() {
 		return {
 			params: {
+				ordering:'-data__毛坯检测_小日期',
 				ordering:'data__毛坯检测_批次号',
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -197,19 +199,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__毛坯检测_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__毛坯检测_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -219,6 +225,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/niuzhuan.vue b/src/views/statistics/bxerp/niuzhuan.vue
index aeadd709..cf0d75c2 100644
--- a/src/views/statistics/bxerp/niuzhuan.vue
+++ b/src/views/statistics/bxerp/niuzhuan.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.name__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -176,6 +176,7 @@ export default {
 				ordering:'-create_time'
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -190,19 +191,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__扭后检测_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__扭后检测_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
@@ -213,6 +218,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2)
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.querys.querys = querys;
 			this.$refs.table.queryData(that.querys);
 		},
diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue
index f829db4d..6d990e55 100644
--- a/src/views/statistics/bxerp/zhongjian1.vue
+++ b/src/views/statistics/bxerp/zhongjian1.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -147,6 +147,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -160,19 +161,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__中检一_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__中检一_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -182,6 +187,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue
index bde97d83..86d9c7cb 100644
--- a/src/views/statistics/bxerp/zhongjian2.vue
+++ b/src/views/statistics/bxerp/zhongjian2.vue
@@ -2,11 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-input v-model="query.batch__contains" 
+				<!-- <el-input v-model="query.name__contains" 
 					placeholder="产品名称" 
 					clearable 
 					style="width: 200px;"
-				></el-input>
+				></el-input> -->
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -147,6 +147,7 @@ export default {
 				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
 			},
 			query:{
+				name__contains:'',
 				batch__contains:'',
 				last_time__gte:'',
 				last_time__lte:'',
@@ -160,19 +161,23 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
-			let obj = {},obj1 = {},obj2 = {};
-			obj.field = 'batch__contains';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__中检二_批次号';
 			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__lte';
+			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
+			obj3.field = 'data__中检二_物料名';
+			obj3.value = that.query.name__contains;
+			obj3.compare = '';
+
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
@@ -182,6 +187,9 @@ export default {
 			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
 				querys[0].push(obj2);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},