fix: 检测统计/批次统计添加检测日期和日期查询

src/views/statistics/bxerp/cpccjcTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="检测数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品尺寸检测_count_use }}</span>
@@ -175,15 +194,12 @@ export default {
 			obj.field = 'data__成品尺寸检测_批次号';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-
+			obj1.field = 'data__成品尺寸检测_日期';
-			obj1.field = 'last_time';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
-
+			obj2.field = 'data__成品尺寸检测_日期';
-			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
-
 			obj3.field = 'material_start__name';
 			obj3.value = that.query.name__contains;
 			obj3.compare = 'contains';

src/views/statistics/bxerp/cpwgfj1Total.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="检测数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检一_count_use }}</span>
@@ -463,15 +482,12 @@ export default {
 			obj.field = 'data__成品外观复检一_批次号';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-
+			obj1.field = 'data__成品外观复检一_日期';
-			obj1.field = 'last_time';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
-
+			obj2.field = 'data__成品外观复检一_日期';
-			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
-
 			obj3.field = 'material_start__name';
 			obj3.value = that.query.name__contains;
 			obj3.compare = 'contains';

src/views/statistics/bxerp/cpwgfj2Total.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="检测数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品外观复检二_count_use }}</span>
@@ -463,15 +482,12 @@ export default {
 			obj.field = 'data__成品外观复检二_批次号';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-
+			obj1.field = 'data__成品外观复检二_日期';
-			obj1.field = 'last_time';
 			obj1.value = that.query.last_time__gte;
 			obj1.compare = 'gte';
-
+			obj2.field = 'data__成品外观复检二_日期';
-			obj2.field = 'last_time';
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
-
 			obj3.field = 'material_start__name';
 			obj3.value = that.query.name__contains;
 			obj3.compare = 'contains';

src/views/statistics/bxerp/cpwgnzcjTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="初检数" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.成品内外初检_count_use }}
@@ -476,11 +495,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';
 

src/views/statistics/bxerp/cpwgnzfjTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="初检数" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.成品内质复检_count_use }}
@@ -464,11 +483,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';
 

src/views/statistics/bxerp/cpxnjyTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="检测数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.成品性能检测_count_use }}</span>
@@ -248,11 +267,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';
 

src/views/statistics/bxerp/cpzjTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="自检数" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.成品自检_count_use }}
@@ -320,11 +339,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';
 

src/views/statistics/bxerp/fenjianTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="分检数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.分检_count_use }}</span>
@@ -164,11 +183,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';
 

src/views/statistics/bxerp/gzcpjcTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="检测数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.光锥成品检测_count_use }}</span>
@@ -188,11 +207,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';
 

src/views/statistics/bxerp/maopiTotal.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 
@@ -34,13 +48,13 @@
 				</el-table-column>
 				<el-table-column label="批次单号" prop="batch" align="center" fixed="left">
 				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" 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="版型" prop="material_start_model" fixed="left">
-				</el-table-column>
 				<el-table-column label="共检" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.毛坯检测_count_use }}
@@ -317,20 +331,31 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]];
-			let obj = {},obj2 = {};
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
 			obj.field = 'batch';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
-			obj2.field = 'material_start__name';
+			obj1.field = 'material_start__name';
-			obj2.value = that.query.name__contains;
+			obj1.value = that.query.name__contains;
-			obj2.compare = 'contains';
+			obj1.compare = 'contains';
+			obj2.field = 'data__毛坯检测_日期';
+			obj2.value = that.query.last_time__gte;
+			obj2.compare = 'gte';
+			obj3.field = 'data__毛坯检测_日期';
+			obj3.value = that.query.last_time__lte;
+			obj3.compare = 'lte';
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
 			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
 				querys[0].push(obj2);
 			}
-
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},

src/views/statistics/bxerp/niuzhuanTotal.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="扭转数" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.扭后检测_count_use }}
@@ -385,11 +404,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';
 

src/views/statistics/bxerp/zhongjian1Total.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="中检数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_count_use }}</span>
@@ -308,11 +327,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';
 

src/views/statistics/bxerp/zhongjian2Total.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 
@@ -36,6 +50,11 @@
 				</el-table-column>
 				<el-table-column label="版型" prop="material_start_model" 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="中检数" fixed="left">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检二_count_use }}</span>
@@ -278,11 +297,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';