fix:禅道055
This commit is contained in:
parent
cbdd8c6ed3
commit
d14f599e08
|
|
@ -580,6 +580,16 @@
|
|||
<span v-if="scope.row.data">{{ scope.row.data.七车间_批次发货合格率 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="组合件批次号" min-width="160">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_组合件_批次号 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发货数">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
|
|
@ -592,7 +602,7 @@ export default {
|
|||
return {
|
||||
params: {
|
||||
ordering:'-data__管料成型_小日期',
|
||||
querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]]
|
||||
querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}],[{field:"data__has_key",compare:"",value:"管料退火_日期"}]]
|
||||
},
|
||||
query:{
|
||||
batch__contains:'',
|
||||
|
|
@ -608,7 +618,7 @@ export default {
|
|||
methods: {
|
||||
handleQuery(){
|
||||
let that = this;
|
||||
let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]];
|
||||
let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}],[{field:"data__has_key",compare:"",value:"管料退火_日期"}]];
|
||||
let obj = {},obj1 = {},obj2 = {};
|
||||
obj.field = 'batch__contains';
|
||||
obj.value = that.query.batch__contains;
|
||||
|
|
@ -621,12 +631,15 @@ export default {
|
|||
obj2.compare = 'lte';
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
querys[1].push(obj);
|
||||
}
|
||||
if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
|
||||
querys[0].push(obj1);
|
||||
querys[1].push(obj1);
|
||||
}
|
||||
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
|
||||
querys[0].push(obj2);
|
||||
querys[1].push(obj2);
|
||||
}
|
||||
let params = {};
|
||||
params.querys = querys;
|
||||
|
|
|
|||
Loading…
Reference in New Issue