fix:更新后0与false严格区别
This commit is contained in:
parent
93e197e09b
commit
fb31274bdb
|
|
@ -94,7 +94,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品尺寸检测_批次号',
|
ordering:'data__成品尺寸检测_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -110,7 +110,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品尺寸检测_批次号';
|
obj.field = 'data__成品尺寸检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品外观复检一_批次号',
|
ordering:'data__成品外观复检一_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -230,7 +230,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品外观复检一_批次号';
|
obj.field = 'data__成品外观复检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,20 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<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"
|
<el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -214,7 +228,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品外观复检二_批次号',
|
ordering:'data__成品外观复检二_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -230,7 +244,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品外观复检二_批次号';
|
obj.field = 'data__成品外观复检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品内外初检_批次号',
|
ordering:'data__成品内外初检_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -235,7 +235,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品内外初检_批次号';
|
obj.field = 'data__成品内外初检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品内质复检_批次号',
|
ordering:'data__成品内质复检_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -230,7 +230,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品内外初检_批次号';
|
obj.field = 'data__成品内外初检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品性能检测_批次号',
|
ordering:'data__成品性能检测_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -140,7 +140,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品性能检测_批次号';
|
obj.field = 'data__成品性能检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__成品自检_批次号',
|
ordering:'data__成品自检_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -170,7 +170,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__成品自检_批次号';
|
obj.field = 'data__成品自检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__分检_批次号',
|
ordering:'data__分检_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -119,7 +119,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__分检_批次号';
|
obj.field = 'data__分检_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__光锥成品检测_批次号',
|
ordering:'data__光锥成品检测_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -115,7 +115,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__光锥成品检测_批次号';
|
obj.field = 'data__光锥成品检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ export default {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__毛坯检测_批次号,-data__毛坯检测_小日期,number_prefix,number_suffix',
|
ordering:'data__毛坯检测_批次号,-data__毛坯检测_小日期,number_prefix,number_suffix',
|
||||||
annotate_field_list:["number_prefix", "number_suffix"],
|
annotate_field_list:["number_prefix", "number_suffix"],
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -195,7 +195,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__毛坯检测_批次号';
|
obj.field = 'data__毛坯检测_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__扭后检测_批次号',
|
ordering:'data__扭后检测_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]],
|
||||||
},
|
},
|
||||||
querys:{
|
querys:{
|
||||||
ordering:'-create_time'
|
ordering:'-create_time'
|
||||||
|
|
@ -237,7 +237,7 @@ export default {
|
||||||
obj3.value = that.query.name__contains;
|
obj3.value = that.query.name__contains;
|
||||||
obj3.compare = 'contains';
|
obj3.compare = 'contains';
|
||||||
|
|
||||||
querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
|
querys=[[{field:"wm",value:false,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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__中检一_批次号',
|
ordering:'data__中检一_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -165,7 +165,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__中检一_批次号';
|
obj.field = 'data__中检一_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,20 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<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"
|
<el-input v-model="query.name__contains"
|
||||||
placeholder="产品名称"
|
placeholder="产品名称"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -144,7 +158,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
params: {
|
params: {
|
||||||
ordering:'data__中检二_批次号',
|
ordering:'data__中检二_批次号',
|
||||||
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]],
|
||||||
},
|
},
|
||||||
query:{
|
query:{
|
||||||
name__contains:'',
|
name__contains:'',
|
||||||
|
|
@ -160,17 +174,17 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
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:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
|
||||||
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
let obj = {},obj1 = {},obj2 = {},obj3 = {};
|
||||||
obj.field = 'data__中检二_批次号';
|
obj.field = 'data__中检二_批次号';
|
||||||
obj.value = that.query.batch__contains;
|
obj.value = that.query.batch__contains;
|
||||||
obj.compare = '';
|
obj.compare = '';
|
||||||
|
|
||||||
obj1.field = 'last_time';
|
obj1.field = 'data__中检二_日期';
|
||||||
obj1.value = that.query.last_time__gte;
|
obj1.value = that.query.last_time__gte;
|
||||||
obj1.compare = 'gte';
|
obj1.compare = 'gte';
|
||||||
|
|
||||||
obj2.field = 'last_time';
|
obj2.field = 'data__中检二_日期';
|
||||||
obj2.value = that.query.last_time__lte;
|
obj2.value = that.query.last_time__lte;
|
||||||
obj2.compare = 'lte';
|
obj2.compare = 'lte';
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue