diff --git a/src/views/modules/todo/todoCenter.vue b/src/views/modules/todo/todoCenter.vue index 497ac0b..1119834 100644 --- a/src/views/modules/todo/todoCenter.vue +++ b/src/views/modules/todo/todoCenter.vue @@ -334,9 +334,11 @@
{{ scope.row.yieldRate }}
- + @@ -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; +}