feat(mes/eqp): 为设备备件新增负责人字段
1. 在EqpEquipmentPart实体类、Bo和Vo中新增responsiblePerson字段 2. 在EqpEquipmentPartMapper.xml中增加responsible_person列映射 3. 在EqpEquipmentPartServiceImpl的查询条件中增加负责人模糊筛选 4. 在前端备件管理页面新增负责人查询输入框、表格列和表单字段
This commit is contained in:
@@ -40,6 +40,11 @@ public class EqpEquipmentPart extends BaseEntity {
|
|||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
/**
|
||||||
|
* 负责人
|
||||||
|
*/
|
||||||
|
private String responsiblePerson;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除标识 0正常 2删除
|
* 删除标识 0正常 2删除
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -38,6 +38,11 @@ public class EqpEquipmentPartBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String lineSection;
|
private String lineSection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 负责人
|
||||||
|
*/
|
||||||
|
private String responsiblePerson;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -45,6 +45,12 @@ public class EqpEquipmentPartVo {
|
|||||||
@ExcelProperty(value = "产线段")
|
@ExcelProperty(value = "产线段")
|
||||||
private String lineSection;
|
private String lineSection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 负责人
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "负责人")
|
||||||
|
private String responsiblePerson;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService {
|
|||||||
lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
|
lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine());
|
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
|
lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
|
||||||
|
lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
<result property="productionLine" column="production_line"/>
|
<result property="productionLine" column="production_line"/>
|
||||||
<result property="lineSection" column="line_section"/>
|
<result property="lineSection" column="line_section"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
|
<result property="responsiblePerson" column="responsible_person"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by"/>
|
<result property="updateBy" column="update_by"/>
|
||||||
|
|||||||
@@ -25,6 +25,14 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="负责人" prop="responsiblePerson">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.responsiblePerson"
|
||||||
|
placeholder="请输入负责人"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -80,6 +88,7 @@
|
|||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
<el-table-column label="产线" align="center" prop="productionLine" />
|
<el-table-column label="产线" align="center" prop="productionLine" />
|
||||||
<el-table-column label="产线段" align="center" prop="lineSection" />
|
<el-table-column label="产线段" align="center" prop="lineSection" />
|
||||||
|
<el-table-column label="负责人" align="center" prop="responsiblePerson" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@@ -121,6 +130,9 @@
|
|||||||
<el-form-item label="产线段" prop="lineSection">
|
<el-form-item label="产线段" prop="lineSection">
|
||||||
<el-input v-model="form.lineSection" placeholder="请输入产线段" />
|
<el-input v-model="form.lineSection" placeholder="请输入产线段" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="负责人" prop="responsiblePerson">
|
||||||
|
<el-input v-model="form.responsiblePerson" placeholder="请输入负责人" />
|
||||||
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||||
@@ -163,7 +175,8 @@ export default {
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
inspectPart: undefined,
|
inspectPart: undefined,
|
||||||
productionLine: undefined,
|
productionLine: undefined,
|
||||||
lineSection: undefined
|
lineSection: undefined,
|
||||||
|
responsiblePerson: undefined
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
@@ -211,7 +224,8 @@ export default {
|
|||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
delFlag: undefined,
|
delFlag: undefined,
|
||||||
productionLine: undefined,
|
productionLine: undefined,
|
||||||
lineSection: undefined
|
lineSection: undefined,
|
||||||
|
responsiblePerson: undefined
|
||||||
};
|
};
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user