diff --git a/klp-ui/src/views/mes/roll/grind/index.vue b/klp-ui/src/views/mes/roll/grind/index.vue
index 2d76adcc..788b06fe 100644
--- a/klp-ui/src/views/mes/roll/grind/index.vue
+++ b/klp-ui/src/views/mes/roll/grind/index.vue
@@ -68,7 +68,7 @@
辊型{{ selectedRoll.rollType === 'WR' ? '工作辊' : '支撑辊' }}
材质{{ selectedRoll.material || '—' }}
初始辊径{{ selectedRoll.initialDia != null ? selectedRoll.initialDia + ' mm' : '—' }}
- 当前辊径{{ selectedRoll.currentDia != null ? selectedRoll.currentDia + ' mm' : '—' }}
+ 当前辊径{{ effectiveCurrentDia != null ? effectiveCurrentDia + ' mm' : '—' }}
最小辊径{{ selectedRoll.minDia != null ? selectedRoll.minDia + ' mm' : '—' }}
磨削次数{{ tableData.length ? tableData.length + ' 次' : '0 次' }}
粗糙度{{ selectedRoll.roughness != null ? selectedRoll.roughness + ' μm' : '—' }}
@@ -296,6 +296,22 @@ export default {
})
},
+ // 有效当前辊径:优先取 currentDia,无则取最新磨削记录的磨后径
+ effectiveCurrentDia() {
+ if (this.selectedRoll && this.selectedRoll.currentDia != null) {
+ return parseFloat(this.selectedRoll.currentDia)
+ }
+ if (this.grindList.length > 0) {
+ const latest = [...this.grindList].sort((a, b) => {
+ const ta = a.grindTime ? new Date(a.grindTime).getTime() : 0
+ const tb = b.grindTime ? new Date(b.grindTime).getTime() : 0
+ return tb - ta
+ })[0]
+ if (latest && latest.diaAfter != null) return parseFloat(latest.diaAfter)
+ }
+ return null
+ },
+
// 表格数据:新增时在顶部插入一个编辑行占位
tableData() {
if (this.editRow && this.editRow.__isNew) {
@@ -401,8 +417,7 @@ export default {
rollId: this.selectedRollId,
grindTime,
team: undefined,
- diaBefore: this.selectedRoll && this.selectedRoll.currentDia != null
- ? parseFloat(this.selectedRoll.currentDia) : undefined,
+ diaBefore: this.effectiveCurrentDia != null ? this.effectiveCurrentDia : undefined,
diaAfter: undefined,
rollShape: '平',
flawResult: '合格',