fix:禅道287
This commit is contained in:
parent
001d9d68f7
commit
3e0fd5f447
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品尺寸检测_批次号 }}</span>
|
||||
|
|
@ -115,9 +116,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品尺寸检测_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品外观复检一_批次号 }}</span>
|
||||
|
|
@ -145,9 +146,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品外观复检一_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品外观复检二_批次号 }}</span>
|
||||
|
|
@ -145,9 +146,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品外观复检二_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品内外初检_批次号 }}</span>
|
||||
|
|
@ -240,9 +241,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品内外初检_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品内质复检_批次号 }}</span>
|
||||
|
|
@ -240,9 +241,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品内外初检_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品性能检测_批次号 }}</span>
|
||||
|
|
@ -155,9 +156,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品性能检测_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.成品自检_批次号 }}</span>
|
||||
|
|
@ -195,9 +196,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__成品自检_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.分检_批次号 }}</span>
|
||||
|
|
@ -129,9 +130,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__分检_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -31,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.光锥成品检测_批次号 }}</span>
|
||||
|
|
@ -125,9 +126,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__光锥成品检测_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -12,11 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -32,6 +32,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.毛坯检测_批次号 }}</span>
|
||||
|
|
@ -202,9 +204,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__毛坯检测_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
@ -234,64 +236,64 @@ export default {
|
|||
return;
|
||||
}
|
||||
let propert = '';
|
||||
if(index == 4&&column.label=='合格数'){
|
||||
if(index == 5&&column.label=='合格数'){
|
||||
propert= '毛坯检测_缺陷项_放大率¢2mm不合格';
|
||||
}
|
||||
if(index == 6&&column.label=='合格数'){
|
||||
if(index == 7&&column.label=='合格数'){
|
||||
propert= '毛坯检测_缺陷项_放大率¢16mm不合格';
|
||||
}
|
||||
if(index == 9&&column.label=='合格数'){
|
||||
if(index == 10&&column.label=='合格数'){
|
||||
propert= '毛坯检测_缺陷项_剪切¢18.3mm不合格';
|
||||
}
|
||||
if(index == 10&&column.label=='可加工'){
|
||||
if(index == 11&&column.label=='可加工'){
|
||||
propert= '毛坯检测_缺陷项_剪切¢18.3mm可加工';
|
||||
}
|
||||
if(index == 11&&column.label=='内标合格'){
|
||||
if(index == 12&&column.label=='内标合格'){
|
||||
propert= '毛坯检测_缺陷项_暗点合格';
|
||||
}
|
||||
if(index == 12&&column.label=='长点不合格'){
|
||||
if(index == 13&&column.label=='长点不合格'){
|
||||
propert= '毛坯检测_缺陷项_暗点不合格';
|
||||
}
|
||||
if(index == 13&&column.label=='可加工'){
|
||||
if(index == 14&&column.label=='可加工'){
|
||||
propert= '毛坯检测_缺陷项_暗点合格';
|
||||
}
|
||||
if(index == 14&&column.label=='暗点重'){
|
||||
if(index == 15&&column.label=='暗点重'){
|
||||
propert= '毛坯检测_缺陷项_暗点重';
|
||||
}
|
||||
if(index == 15&&column.label=='花丝'){
|
||||
if(index == 16&&column.label=='花丝'){
|
||||
propert= '毛坯检测_缺陷项_花丝';
|
||||
}
|
||||
if(index == 16&&column.label=='网格'){
|
||||
if(index == 17&&column.label=='网格'){
|
||||
propert= '毛坯检测_缺陷项_网格';
|
||||
}
|
||||
if(index == 17&&column.label=='轻'){
|
||||
if(index == 18&&column.label=='轻'){
|
||||
propert= '毛坯检测_缺陷项_花朵';
|
||||
}
|
||||
if(index == 18&&column.label=='重'){
|
||||
if(index == 19&&column.label=='重'){
|
||||
propert= '毛坯检测_缺陷项_花朵重';
|
||||
}
|
||||
if(index == 19&&column.label=='S畸变不合格'){
|
||||
if(index == 20&&column.label=='S畸变不合格'){
|
||||
propert= '毛坯检测_缺陷项_S畸变不合格';
|
||||
}
|
||||
if(index == 20&&column.label=='弓形畸变不合格'){
|
||||
if(index == 21&&column.label=='弓形畸变不合格'){
|
||||
propert= '毛坯检测_缺陷项_弓形畸变不合格';
|
||||
}
|
||||
if(index == 21&&column.label=='炸废'){
|
||||
if(index == 22&&column.label=='炸废'){
|
||||
propert= '毛坯检测_缺陷项_炸废';
|
||||
}
|
||||
if(index == 22&&column.label=='角偏'){
|
||||
if(index == 23&&column.label=='角偏'){
|
||||
propert= '毛坯检测_缺陷项_角偏';
|
||||
}
|
||||
if(index == 23&&column.label=='色差'){
|
||||
if(index == 24&&column.label=='色差'){
|
||||
propert= '毛坯检测_缺陷项_色差';
|
||||
}
|
||||
if (propert!=='') {
|
||||
let values = [];
|
||||
if(index==4||index==6){
|
||||
if(index==5||index==7){
|
||||
values = data.map((item) =>!item.data[propert]?1:0);
|
||||
}else if(index==9){
|
||||
}else if(index==10){
|
||||
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切¢18.3mm可加工']?1:0);
|
||||
}else if(index==13){
|
||||
}else if(index==14){
|
||||
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_暗点不合格']?1:0);
|
||||
}else{
|
||||
values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<!-- <el-input v-model="query.name__contains"
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input> -->
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -17,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -36,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.扭后检测_批次号 }}</span>
|
||||
|
|
@ -219,9 +215,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__扭后检测_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<!-- <el-input v-model="query.name__contains"
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input> -->
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -17,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -36,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.中检一_批次号 }}</span>
|
||||
|
|
@ -175,9 +171,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__中检一_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<!-- <el-input v-model="query.name__contains"
|
||||
<el-input v-model="query.name__contains"
|
||||
placeholder="产品名称"
|
||||
clearable
|
||||
style="width: 200px;"
|
||||
></el-input> -->
|
||||
></el-input>
|
||||
<el-input v-model="query.batch__contains"
|
||||
placeholder="批次号"
|
||||
clearable
|
||||
|
|
@ -17,12 +17,6 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button
|
||||
@click="handleExport"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -36,6 +30,8 @@
|
|||
stripe
|
||||
>
|
||||
<el-table-column type="index" width="50" fixed="left"/>
|
||||
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
|
||||
</el-table-column>
|
||||
<el-table-column label="批次号" fixed="left">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.data.中检二_批次号 }}</span>
|
||||
|
|
@ -175,9 +171,9 @@ export default {
|
|||
obj2.value = that.query.last_time__lte;
|
||||
obj2.compare = 'lte';
|
||||
|
||||
obj3.field = 'data__中检二_物料名';
|
||||
obj3.field = 'material__name';
|
||||
obj3.value = that.query.name__contains;
|
||||
obj3.compare = '';
|
||||
obj3.compare = 'contains';
|
||||
|
||||
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
|
||||
querys[0].push(obj);
|
||||
|
|
|
|||
Loading…
Reference in New Issue