Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

1. 在EqpEquipmentPart实体类、Bo和Vo中新增responsiblePerson字段
2. 在EqpEquipmentPartMapper.xml中增加responsible_person列映射
3. 在EqpEquipmentPartServiceImpl的查询条件中增加负责人模糊筛选
4. 在前端备件管理页面新增负责人查询输入框、表格列和表单字段

klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java

@@ -40,6 +40,11 @@ public class EqpEquipmentPart extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 负责人
+     */
+    private String responsiblePerson;
+
     /**
      * 删除标识 0正常 2删除
      */

klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java

@@ -38,6 +38,11 @@ public class EqpEquipmentPartBo extends BaseEntity {
      */
     private String lineSection;
 
+    /**
+     * 负责人
+     */
+    private String responsiblePerson;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java

@@ -45,6 +45,12 @@ public class EqpEquipmentPartVo {
     @ExcelProperty(value = "产线段")
     private String lineSection;
 
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "负责人")
+    private String responsiblePerson;
+
     /**
      * 备注
      */

klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java

@@ -84,6 +84,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService {
         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.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
+        lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson());
         return lqw;
     }
 

klp-mes/src/main/resources/mapper/eqp/EqpEquipmentPartMapper.xml

@@ -10,6 +10,7 @@
         <result property="productionLine" column="production_line"/>
         <result property="lineSection" column="line_section"/>
         <result property="remark" column="remark"/>
+        <result property="responsiblePerson" column="responsible_person"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

klp-ui/src/views/mes/eqp/check/part.vue

@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </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-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>
@@ -80,6 +88,7 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="产线" align="center" prop="productionLine" />
       <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">
         <template slot-scope="scope">
           <el-button
@@ -121,6 +130,9 @@
         <el-form-item label="产线段" prop="lineSection">
           <el-input v-model="form.lineSection" placeholder="请输入产线段" />
         </el-form-item>
+        <el-form-item label="负责人" prop="responsiblePerson">
+          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -163,7 +175,8 @@ export default {
         pageSize: 10,
         inspectPart: undefined,
         productionLine: undefined,
-        lineSection: undefined
+        lineSection: undefined,
+        responsiblePerson: undefined
       },
       // 表单参数
       form: {},
@@ -211,7 +224,8 @@ export default {
         updateTime: undefined,
         delFlag: undefined,
         productionLine: undefined,
-        lineSection: undefined
+        lineSection: undefined,
+        responsiblePerson: undefined
       };
       this.resetForm("form");
     },