fix:统计分析调整
This commit is contained in:
parent
3d76ab3b93
commit
44ff595cb1
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -92,6 +92,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -105,19 +106,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品尺寸检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -127,6 +132,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -122,6 +122,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -135,19 +136,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品外观复检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -157,6 +162,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -122,6 +122,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -135,19 +136,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3={};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品外观复检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -157,6 +162,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -212,6 +212,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -225,19 +226,24 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品内外初检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -247,6 +253,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -132,6 +132,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -145,19 +146,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品性能检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -167,6 +172,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -172,6 +172,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -185,19 +186,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__成品自检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -207,6 +212,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -106,6 +106,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -119,19 +120,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__分检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -141,6 +146,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.name__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -180,10 +180,12 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
|
ordering:'-data__毛坯检测_小日期',
|
||||||
ordering:'data__毛坯检测_批次号',
|
ordering:'data__毛坯检测_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -197,19 +199,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__毛坯检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -219,6 +225,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.name__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -176,6 +176,7 @@ export default {
|
||||||
ordering:'-create_time'
|
ordering:'-create_time'
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -190,19 +191,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [];
|
let querys = [];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__扭后检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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:"扭后检测_批次号"}]]
|
querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
|
||||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
|
|
@ -213,6 +218,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2)
|
querys[0].push(obj2)
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.querys.querys = querys;
|
that.querys.querys = querys;
|
||||||
this.$refs.table.queryData(that.querys);
|
this.$refs.table.queryData(that.querys);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -147,6 +147,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -160,19 +161,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__中检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -182,6 +187,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-input v-model="query.batch__contains"
|
<!-- <el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input> -->
|
||||||
<el-input v-model="query.batch__contains"
|
<el-input v-model="query.batch__contains"
|
||||||
placeholder="批次号"
|
placeholder="批次号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -147,6 +147,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
last_time__lte:'',
|
last_time__lte:'',
|
||||||
|
|
@ -160,19 +161,23 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
|
let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'batch__contains';
|
obj.field = 'data__中检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time__gte';
|
obj1.field = 'last_time';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time__lte';
|
obj2.field = 'last_time';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = '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){
|
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||||
querys[0].push(obj);
|
querys[0].push(obj);
|
||||||
}
|
}
|
||||||
|
|
@ -182,6 +187,9 @@ export default {
|
||||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||||
querys[0].push(obj2);
|
querys[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
|
querys[0].push(obj3);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue