|
|
|
@ -334,9 +334,11 @@ |
|
|
|
<div class="readonly-number yield">{{ scope.row.yieldRate }}</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="总良率" width="88" align="center"> |
|
|
|
<el-table-column label="总良率" width="88" align="center" class-name="total-yield-column"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div class="readonly-number total-yield">{{ scope.row.totalYieldRate }}</div> |
|
|
|
<div class="readonly-text-cell total-yield-cell"> |
|
|
|
<div class="readonly-text-scroll total-yield-text">{{ scope.row.totalYieldRate || '-' }}</div> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="总数" width="80" align="right"> |
|
|
|
@ -732,7 +734,7 @@ export default { |
|
|
|
if (!row || !column) { |
|
|
|
return |
|
|
|
} |
|
|
|
const needMerge = column.label === '总量率' || column.label === 'Packing List' || column.label === '备注' |
|
|
|
const needMerge = column.label === '总量率' || column.label === '总良率' || column.label === 'Packing List' || column.label === '备注' |
|
|
|
if (!needMerge) { |
|
|
|
return |
|
|
|
} |
|
|
|
@ -1509,7 +1511,8 @@ export default { |
|
|
|
} |
|
|
|
|
|
|
|
.todo-cache-detail-dialog /deep/ .todo-detail-table td.remark-column, |
|
|
|
.todo-cache-detail-dialog /deep/ .todo-detail-table td.packing-list-column { |
|
|
|
.todo-cache-detail-dialog /deep/ .todo-detail-table td.packing-list-column, |
|
|
|
.todo-cache-detail-dialog /deep/ .todo-detail-table td.total-yield-column { |
|
|
|
padding: 0 !important; |
|
|
|
position: relative !important; |
|
|
|
} |
|
|
|
@ -1531,4 +1534,18 @@ export default { |
|
|
|
line-height: 18px; |
|
|
|
color: #606266; |
|
|
|
} |
|
|
|
|
|
|
|
.todo-cache-detail-dialog .total-yield-cell { |
|
|
|
text-align: center; |
|
|
|
} |
|
|
|
|
|
|
|
.todo-cache-detail-dialog .total-yield-text { |
|
|
|
max-height: none; |
|
|
|
overflow-y: hidden; |
|
|
|
white-space: nowrap; |
|
|
|
word-break: normal; |
|
|
|
color: #409eff; |
|
|
|
font-weight: bold; |
|
|
|
line-height: 24px; |
|
|
|
} |
|
|
|
</style> |