This commit is contained in:
liushuai
2020-04-17 18:07:27 +08:00
parent 199f7fbbec
commit 1f2325301a
10 changed files with 500 additions and 39 deletions

View File

@@ -126,9 +126,14 @@
{{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="提交人" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column label="补投数" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.补投数量 }}
{{ scope.row.补投数量 !== 0 || scope.row.补投数量 ? scope.row.补投数量 : '' }}
</template>
</el-table-column>
<el-table-column label="补投时间" align="center" width="90">
@@ -136,6 +141,11 @@
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="补投人" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
<el-table-column label="质检备注" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -300,7 +310,7 @@ export default {
})
},
selectable(row) {
return row.报废时间 === null
return (row.报废时间 === null && row.不合格处理文本 === '报废')
},
handleSelectionChange(val) {
this.procedureGroup = val