feat:禅道374
This commit is contained in:
parent
9733fcced6
commit
ecdade1667
|
|
@ -17,6 +17,12 @@
|
||||||
placeholder="结束时间"
|
placeholder="结束时间"
|
||||||
style="margin-left: 2px; width: 150px"
|
style="margin-left: 2px; width: 150px"
|
||||||
/>
|
/>
|
||||||
|
<el-input v-model="query1.batch_contains"
|
||||||
|
placeholder="批次号"
|
||||||
|
clearable
|
||||||
|
style="width: 200px;"
|
||||||
|
v-if="activeName=='product'"
|
||||||
|
></el-input>
|
||||||
<el-input v-model="query1.number_contains"
|
<el-input v-model="query1.number_contains"
|
||||||
placeholder="板号"
|
placeholder="板号"
|
||||||
clearable
|
clearable
|
||||||
|
|
@ -112,6 +118,11 @@
|
||||||
<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
|
<span>{{ scope.row.data.排板_检测项_丝高?scope.row.data.排板_检测项_丝高:'' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="间距" align="center">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ scope.row.data.排板_检测项_间距?scope.row.data.排板_检测项_间距:'' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="炉号" align="center">
|
<el-table-column label="炉号" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:'' }}</span>
|
<span>{{ scope.row.data.装炉压板出炉_设备编号?scope.row.data.装炉压板出炉_设备编号:'' }}</span>
|
||||||
|
|
@ -574,6 +585,7 @@ export default {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
query1:{
|
query1:{
|
||||||
|
batch_contains:'',
|
||||||
number_contains:'',
|
number_contains:'',
|
||||||
time_gte:'',
|
time_gte:'',
|
||||||
time_lte:'',
|
time_lte:'',
|
||||||
|
|
@ -682,6 +694,13 @@ export default {
|
||||||
querys1[0].push(obj2);
|
querys1[0].push(obj2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(that.activeName=='product'&&that.query1.batch_contains!==''&&that.query1.batch_contains!==null){
|
||||||
|
let obj3 = {};
|
||||||
|
obj3.field = 'wm__batch';
|
||||||
|
obj3.value = that.query1.batch_contains;
|
||||||
|
obj3.compare = '';
|
||||||
|
querys1[0].push(obj3);
|
||||||
|
}
|
||||||
that.$nextTick(() => {
|
that.$nextTick(() => {
|
||||||
if(that.activeName=='product'){
|
if(that.activeName=='product'){
|
||||||
that.params1.querys = querys1;
|
that.params1.querys = querys1;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue