fix:禅道353
This commit is contained in:
parent
3643a2a95c
commit
f47bcebbbb
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -128,9 +133,10 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'-data__凹面检测_日期',
|
ordering:'-data__凹面检测_日期',
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"凹面检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__凹面检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"凹面检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -145,7 +151,7 @@ export default {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"凹面检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"凹面检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__凹面检测_批次号';
|
obj.field = 'data__凹面检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -162,6 +168,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -174,6 +184,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -117,6 +122,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -130,8 +136,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品尺寸检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品尺寸检测_批次号';
|
obj.field = 'data__成品尺寸检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -148,6 +154,11 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -160,6 +171,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -236,6 +241,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -249,8 +255,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品外观复检一_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品外观复检一_批次号';
|
obj.field = 'data__成品外观复检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -267,6 +273,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -279,6 +289,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -236,6 +241,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -249,8 +255,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品外观复检二_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品外观复检二_批次号';
|
obj.field = 'data__成品外观复检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -267,6 +273,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -279,6 +289,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -241,6 +246,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -254,8 +260,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品内外初检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品内外初检_批次号';
|
obj.field = 'data__成品内外初检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -272,6 +278,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
|
|
@ -285,6 +295,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -236,6 +241,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -249,8 +255,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品内外初检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品内外初检_批次号';
|
obj.field = 'data__成品内外初检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -267,6 +273,9 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
|
|
@ -280,6 +289,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -146,6 +151,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -159,8 +165,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品性能检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品性能检测_批次号';
|
obj.field = 'data__成品性能检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -177,6 +183,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -189,6 +199,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -176,6 +181,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -189,8 +195,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__成品自检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__成品自检_批次号';
|
obj.field = 'data__成品自检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -207,6 +213,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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 +229,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -122,9 +127,10 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'-data__分检_日期',
|
ordering:'-data__分检_日期',
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__分检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -138,8 +144,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__分检_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__分检_批次号';
|
obj.field = 'data__分检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -156,6 +162,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -168,6 +178,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -121,6 +126,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -134,8 +140,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__光锥成品检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__光锥成品检测_批次号';
|
obj.field = 'data__光锥成品检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -152,6 +158,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
|
|
@ -165,6 +175,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -202,6 +207,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -215,8 +221,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},,{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__毛坯检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__毛坯检测_批次号';
|
obj.field = 'data__毛坯检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -233,6 +239,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -245,6 +255,10 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
|
console.log('querys[0]',querys[0]);
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -224,6 +229,7 @@ export default {
|
||||||
ordering:'-create_time'
|
ordering:'-create_time'
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -238,8 +244,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__扭后检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__扭后检测_批次号';
|
obj.field = 'data__扭后检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -256,7 +262,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
querys=[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -269,6 +278,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.querys.querys = querys;
|
that.querys.querys = querys;
|
||||||
this.$refs.table.queryData(that.querys);
|
this.$refs.table.queryData(that.querys);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -131,6 +136,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -144,8 +150,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__抛凹面检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__抛凹面检测_批次号';
|
obj.field = 'data__抛凹面检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -162,6 +168,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -174,6 +184,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -126,6 +131,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -139,8 +145,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__抛角检测_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__抛角检测_批次号';
|
obj.field = 'data__抛角检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -157,6 +163,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -169,6 +179,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -661,7 +661,7 @@ export default {
|
||||||
{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
||||||
}
|
}
|
||||||
let obj = {},obj1 = {},obj2 = {};
|
let obj = {},obj1 = {},obj2 = {};
|
||||||
obj.field = that.activeName=='product'?'data__装炉压板出炉_批次号':'data__毛坯检测_批次号';
|
obj.field = that.activeName=='product'?'number':'number';
|
||||||
obj.value = that.query1.number_contains;
|
obj.value = that.query1.number_contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -197,6 +202,7 @@ export default {
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -210,8 +216,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__中检一_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__中检一_批次号';
|
obj.field = 'data__中检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -228,6 +234,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -240,6 +250,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
that.params.querys = querys;
|
that.params.querys = querys;
|
||||||
this.$refs.table.queryData(that.params);
|
this.$refs.table.queryData(that.params);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@
|
||||||
clearable
|
clearable
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
|
<el-input v-model="query.number__contains"
|
||||||
|
placeholder="板段号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
></el-input>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
|
|
@ -175,9 +180,10 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'-data__中检二_日期',
|
ordering:'-data__中检二_日期',
|
||||||
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__中检二_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
|
number__contains:'',
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
batch__contains:'',
|
batch__contains:'',
|
||||||
last_time__gte:'',
|
last_time__gte:'',
|
||||||
|
|
@ -191,8 +197,8 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery(){
|
handleQuery(){
|
||||||
let that = this;
|
let that = this;
|
||||||
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
|
let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__中检二_日期",compare:"isnull",value:false},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {},obj4 = {};
|
||||||
obj.field = 'data__中检二_批次号';
|
obj.field = 'data__中检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
@ -209,6 +215,10 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
|
obj4.field = 'number';
|
||||||
|
obj4.value = that.query.number__contains;
|
||||||
|
obj4.compare = 'contains';
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
@ -221,6 +231,9 @@ export default {
|
||||||
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
if(that.query.name__contains!==''&&that.query.name__contains!==null){
|
||||||
querys[0].push(obj3);
|
querys[0].push(obj3);
|
||||||
}
|
}
|
||||||
|
if(that.query.number__contains!==''&&that.query.number__contains!==null){
|
||||||
|
querys[0].push(obj4);
|
||||||
|
}
|
||||||
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