feat(检验任务执行):
1.新增检验细类字段,显示成描述 2.检验任务作业表格中的检验计划编号列移动到后面去,前面展示检验细类列以及状态列
This commit is contained in:
parent
67cf7da673
commit
ac82734661
@ -132,25 +132,59 @@
|
||||
<el-link type="primary" @click="openOriginalJobNo(scope.row)">{{ scope.row.originalJobNo }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-for="(item, index) in tableObj"
|
||||
v-if="index < 6"
|
||||
:key="item.prop"
|
||||
:prop="item.prop"
|
||||
:min-width="item.width"
|
||||
:label="$t(item.label)"
|
||||
:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
|
||||
>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
v-for="(item, index) in tableObj"
|
||||
v-if="index > 0 && index < 5"
|
||||
:key="item.prop"
|
||||
:prop="item.prop"
|
||||
:min-width="item.width"
|
||||
:label="$t(item.label)"
|
||||
:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
|
||||
>
|
||||
</el-table-column>
|
||||
|
||||
<!-- 检验细类 -->
|
||||
<el-table-column
|
||||
label="检验细类"
|
||||
width="110"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{qcSubCategoriesListFind(scope.row.qcSubCategories)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- 判定结果 -->
|
||||
<el-table-column
|
||||
:label="$t('mes.judgeResult')"
|
||||
width="80"
|
||||
:label="$t('mes.judgeResult')"
|
||||
width="80"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{resultListFind(scope.row.result)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- 状态 -->
|
||||
<el-table-column
|
||||
prop="newStatus"
|
||||
:label="$t('crud.column.label.status1')"
|
||||
width="80"
|
||||
:render-header="
|
||||
(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, statusOptions)
|
||||
"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
v-for="(item, index) in tableObj"
|
||||
v-if="index == 5"
|
||||
:key="item.prop"
|
||||
:prop="item.prop"
|
||||
:min-width="item.width"
|
||||
:label="$t(item.label)"
|
||||
:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
|
||||
>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column width="80" prop="rollType" label="膜卷类型">
|
||||
<template slot-scope="scope">
|
||||
{{findRollType(scope.row.rollType)}}
|
||||
@ -158,14 +192,18 @@
|
||||
</el-table-column>
|
||||
<el-table-column width="200" prop="bigBatchNo" label="大批次">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newStatus"
|
||||
:label="$t('crud.column.label.status1')"
|
||||
width="80"
|
||||
:render-header="
|
||||
(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, statusOptions)
|
||||
"
|
||||
></el-table-column>
|
||||
|
||||
<!-- 检验计划编号 -->
|
||||
<el-table-column
|
||||
v-for="(item, index) in tableObj"
|
||||
v-if="index == 0"
|
||||
:key="item.prop"
|
||||
:prop="item.prop"
|
||||
:min-width="item.width"
|
||||
:label="$t(item.label)"
|
||||
:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-for="(item, index) in tableObj"
|
||||
v-if="index > 6 && index < 10"
|
||||
@ -502,6 +540,16 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
// 检验细类转换描述
|
||||
qcSubCategoriesListFind(qcSubCategories) {
|
||||
let me = this
|
||||
for (let i = 0; i < me.qcSubCategoriesList.length; i++) {
|
||||
let row = me.qcSubCategoriesList[i]
|
||||
if (row.value === qcSubCategories) {
|
||||
return row.label
|
||||
}
|
||||
}
|
||||
},
|
||||
//膜卷类型
|
||||
findRollType(rolType) {
|
||||
let me = this
|
||||
|
||||
Loading…
Reference in New Issue
Block a user