feat(mes): 添加轧辊磨削复核人字段
- 在前端表格中新增复核人列,支持编辑和显示功能 - 在 MesRollGrind 实体类中添加 reviewer 字段 - 在 MesRollGrindBo 和 MesRollGrindVo 中添加 reviewer 字段 - 更新数据库查询映射文件,包含 reviewer 字段的查询 - 初始化新增行时将 reviewer 设置为 undefined
This commit is contained in:
@@ -82,6 +82,9 @@ public class MesRollGrind extends BaseEntity {
|
|||||||
/** 操作者 */
|
/** 操作者 */
|
||||||
private String operator;
|
private String operator;
|
||||||
|
|
||||||
|
/** 复核人 */
|
||||||
|
private String reviewer;
|
||||||
|
|
||||||
/** 备注 */
|
/** 备注 */
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|||||||
@@ -37,5 +37,6 @@ public class MesRollGrindBo extends BaseEntity {
|
|||||||
private String flawResult;
|
private String flawResult;
|
||||||
private BigDecimal hardness;
|
private BigDecimal hardness;
|
||||||
private String operator;
|
private String operator;
|
||||||
|
private String reviewer;
|
||||||
private String remark;
|
private String remark;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ public class MesRollGrindVo {
|
|||||||
private String flawResult;
|
private String flawResult;
|
||||||
private BigDecimal hardness;
|
private BigDecimal hardness;
|
||||||
private String operator;
|
private String operator;
|
||||||
|
private String reviewer;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
dia_before, dia_after, grind_amount, roll_shape,
|
dia_before, dia_after, grind_amount, roll_shape,
|
||||||
flaw_result,
|
flaw_result,
|
||||||
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
|
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
|
||||||
operator, remark, create_time
|
operator, reviewer, remark, create_time
|
||||||
FROM mes_roll_grind
|
FROM mes_roll_grind
|
||||||
WHERE del_flag = 0 AND roll_id = #{rollId}
|
WHERE del_flag = 0 AND roll_id = #{rollId}
|
||||||
ORDER BY grind_time Desc
|
ORDER BY grind_time Desc
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
g.dia_before, g.dia_after, g.grind_amount, g.roll_shape,
|
g.dia_before, g.dia_after, g.grind_amount, g.roll_shape,
|
||||||
g.flaw_result,
|
g.flaw_result,
|
||||||
CASE WHEN g.hardness = '未倒角' THEN 0 ELSE CAST(g.hardness AS DECIMAL(10,1)) END AS hardness,
|
CASE WHEN g.hardness = '未倒角' THEN 0 ELSE CAST(g.hardness AS DECIMAL(10,1)) END AS hardness,
|
||||||
g.operator, g.remark, g.create_time,
|
g.operator, g.reviewer, g.remark, g.create_time,
|
||||||
ri.roll_type
|
ri.roll_type
|
||||||
FROM mes_roll_grind g
|
FROM mes_roll_grind g
|
||||||
LEFT JOIN mes_roll_info ri ON g.roll_id = ri.roll_id
|
LEFT JOIN mes_roll_info ri ON g.roll_id = ri.roll_id
|
||||||
|
|||||||
@@ -269,6 +269,19 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column label="复核人" align="center" width="100">
|
||||||
|
<template slot-scope="{row}">
|
||||||
|
<el-input
|
||||||
|
v-if="isEditing(row)"
|
||||||
|
v-model="editRow.reviewer"
|
||||||
|
size="mini"
|
||||||
|
style="width:84px"
|
||||||
|
placeholder="选填"
|
||||||
|
/>
|
||||||
|
<span v-else class="remark-text">{{ row.reviewer || '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column label="备注" align="left" width="120">
|
<el-table-column label="备注" align="left" width="120">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -703,6 +716,7 @@ export default {
|
|||||||
flawResult: '合格',
|
flawResult: '合格',
|
||||||
hardness: lastHardness,
|
hardness: lastHardness,
|
||||||
operator: this.currentUserName,
|
operator: this.currentUserName,
|
||||||
|
reviewer: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user