fix:棒管统计字段/条件查询 修正

This commit is contained in:
shijing 2024-12-04 13:48:34 +08:00
parent 0d2a4a25ff
commit 578c69b599
2 changed files with 17 additions and 12 deletions

View File

@ -515,9 +515,10 @@ export default {
return {
params: {
ordering:'-last_time',
batch__contains:'ZJ2',
batch__startswith__in:'ZJ2,G05',
},
query:{
batch__contains:'',
last_time__gte:'',
last_time__lte:'',
},

View File

@ -9,18 +9,18 @@
></el-input>
<el-date-picker
v-model="query.last_time__gte"
type="date"
placeholder="开始日期"
value-format="YYYY-MM-DD"
type="datetime"
placeholder="开始时间"
value-format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 200px; margin: 5px"
>
</el-date-picker>
<el-date-picker
v-model="query.last_time__lte"
type="date"
placeholder="截止日期"
value-format="YYYY-MM-DD"
type="datetime"
placeholder="截止时间"
value-format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 200px; margin:0"
>
@ -251,9 +251,12 @@
</template>
</el-table-column>
<el-table-column label="备注">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.十车间入库_检验备注 }}</span>
</template>
</el-table-column>
<el-table-column label="接收人">
<template #default="scope">{{ scope.row.data.十车间入库_仓库执行人 }}</template>
<template #default="scope">{{ scope.row.data.十车间入库_备注 }}</template>
</el-table-column>
</el-table-column>
<el-table-column label="退火" align="center">
@ -367,9 +370,9 @@
</template>
</el-table-column>
<el-table-column label="备注">
<!-- <template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.备注 }}</span>
</template> -->
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_备注 }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="检验" align="center">
@ -528,9 +531,10 @@ export default {
return {
params: {
ordering:'-last_time',
batch__contains:'ZB2',
batch__startswith__in:'ZB2',
},
query:{
batch__contains:'',
last_time__gte:'',
last_time__lte:'',