diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
index f9436315..a92863a9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
@@ -76,6 +76,11 @@ public class AutoCreateLubricate {
                             if (num <= 3) {
                                 this.createMain(param);
                             }
+                            // 周期为周 ：当前日期-保养计划日期 <= 1 天时，新增保养单
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num <= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 } else {
@@ -114,6 +119,11 @@ public class AutoCreateLubricate {
                             if (num >= 3) {
                                 this.createMain(param);
                             }
+                            // 周期为日 ：当前日期-保养实际结束 <= 1 天时，新增保养单
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num >= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
index 2e069ec6..4f47b2c4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
@@ -81,6 +81,11 @@ public class AutoCreateRepair {
                             if (num <= 3) {
                                 this.createRepair(param);
                             }
+                            // 周期为日 ： 维修计划日期 - 当前日期 <= 1 天时，新增维修单
+                        } else if (StrUtil.equals(maintenancecycle,"05")) {
+                            if (num <= 1) {
+                                this.createRepair(param);
+                            }
                         }
                     }
                 } else {
@@ -122,6 +127,11 @@ public class AutoCreateRepair {
                             if (num >= 3) {
                                 this.createRepair(param);
                             }
+                            // 周期为日 ：当前日期-维修实际结束 <= 1 天时，新增维修单
+                        } else if (StrUtil.equals(maintenancecycle,"05")) {
+                            if (num >= 1) {
+                                this.createRepair(param);
+                            }
                         }
                     }
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
index c5476508..c06a6c9b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
@@ -76,6 +76,10 @@ public class AutoCreateSportCheck {
                             if (num <= 3) {
                                 this.createMain(param);
                             }
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num <= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 } else {
@@ -114,6 +118,10 @@ public class AutoCreateSportCheck {
                             if (num >= 3) {
                                 this.createMain(param);
                             }
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num >= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
index cf018f87..ff0b10e8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
@@ -76,6 +76,10 @@ public class AutoCreateUpkeep {
                             if (num <= 3) {
                                 this.createMain(param);
                             }
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num <= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 } else {
@@ -114,6 +118,10 @@ public class AutoCreateUpkeep {
                             if (num >= 3) {
                                 this.createMain(param);
                             }
+                        } else if (StrUtil.equals(maintenancecycle,"04")) {
+                            if (num >= 1) {
+                                this.createMain(param);
+                            }
                         }
                     }
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java
index 942c10d8..93551633 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java
@@ -100,7 +100,11 @@ public class DevicelubricateplanmstServiceImpl implements Devicelubricateplanmst
                     Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
                     jo.put("next_end_date", DateUtil.formatDate(next_end_date));
                     ja2.add(jo);
-                }else{
+                }else if (maintenancecycle2.equals("04")) { // 日
+                    Date next_end_date = DateUtil.offsetDay(real_end_date2,1);
+                    jo.put("next_end_date", DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                } else{
                     jo.put("next_end_date","");
                     ja2.add(jo);
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java
index 3ddbadcd..93239952 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java
@@ -99,7 +99,11 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
                     Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
                     jo.put("next_end_date", DateUtil.formatDate(next_end_date));
                     ja2.add(jo);
-                }else{
+                }else if (maintenancecycle2.equals("05")) { // 日
+                    Date next_end_date = DateUtil.offsetDay(real_end_date2,1);
+                    jo.put("next_end_date", DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                } else{
                     jo.put("next_end_date","");
                     ja2.add(jo);
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java
index 5b812f6d..270c5f8a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java
@@ -100,6 +100,10 @@ public class DevicesportcheckplanmstServiceImpl implements Devicesportcheckplanm
                     Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
                     jo.put("next_end_date", DateUtil.formatDate(next_end_date));
                     ja2.add(jo);
+                }else if (maintenancecycle2.equals("04")) { // 日
+                    Date next_end_date = DateUtil.offsetDay(real_end_date2,1);
+                    jo.put("next_end_date", DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
                 }else{
                     jo.put("next_end_date","");
                     ja2.add(jo);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
index b4e3a01a..dfcdb900 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
@@ -100,7 +100,11 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
                     Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
                     jo.put("next_end_date", DateUtil.formatDate(next_end_date));
                     ja2.add(jo);
-                }else{
+                } else if (maintenancecycle2.equals("04")) { // 日
+                    Date next_end_date = DateUtil.offsetDay(real_end_date2,1);
+                    jo.put("next_end_date", DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                } else{
                     jo.put("next_end_date","");
                     ja2.add(jo);
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java
new file mode 100644
index 00000000..640b95df
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java
@@ -0,0 +1,113 @@
+
+package org.nl.wms.masterdata_manage.controller.em;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiRepairDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Liu xy
+* @date 2022-05-26
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "维修人与设备档案维护")
+@RequestMapping("/api/embirepairdevice")
+@Slf4j
+public class EmBiRepairDeviceController {
+
+    @Autowired
+    private EmBiRepairDeviceService emBiRepairDeviceService;
+
+    @GetMapping
+    @Log("查询人员设备维护")
+    public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiRepairDeviceService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @GetMapping("/device")
+    @Log("查询设备")
+    //("查询设备")
+    public ResponseEntity<Object> device(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiRepairDeviceService.queryAllDevice(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增人员设备维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
+        Assert.notNull(entity,"请求参数不能为空");
+
+        EmBiRepairDevice one = emBiRepairDeviceService.getOne(
+                new QueryWrapper<EmBiRepairDevice>().lambda()
+                        .eq(EmBiRepairDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiRepairDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiRepairDevice emBiRepairDevice = entity.toJavaObject(EmBiRepairDevice.class);
+        emBiRepairDevice.setPerson_id(IdUtil.getStringId());
+        emBiRepairDeviceService.save(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改人员设备维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject entity){
+
+        EmBiRepairDevice one = emBiRepairDeviceService.getOne(
+                new QueryWrapper<EmBiRepairDevice>().lambda()
+                        .eq(EmBiRepairDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiRepairDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiRepairDevice emBiRepairDevice = emBiRepairDeviceService.getById(entity.getString("person_id"));
+        emBiRepairDevice.setDevice_code(entity.getString("device_code"));
+        emBiRepairDeviceService.updateById(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+
+    @Log("删除人员设备维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids != null && ids.length>0){
+            emBiRepairDeviceService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiRepairDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiRepairDeviceService.java
new file mode 100644
index 00000000..e6d12660
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiRepairDeviceService.java
@@ -0,0 +1,28 @@
+package org.nl.wms.masterdata_manage.service.em;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiRepairDeviceService extends IService<EmBiRepairDevice> {
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    List<Map> queryAll(DeviceUserQuery whereJson);
+
+    List<Map> queryAllDevice(DeviceUserQuery whereJson);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiRepairDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiRepairDevice.java
new file mode 100644
index 00000000..b62a7abd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiRepairDevice.java
@@ -0,0 +1,38 @@
+package org.nl.wms.masterdata_manage.service.em.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 人员设备关系表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("em_bi_repairpersondevice")
+public class EmBiRepairDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String person_id;
+    /**
+     * 用户id
+     */
+    private String user_id;
+
+    /**
+     * 设备编码
+     */
+    private String device_code;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.java
new file mode 100644
index 00000000..8f4b0751
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.java
@@ -0,0 +1,24 @@
+package org.nl.wms.masterdata_manage.service.em.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiRepairDeviceMapper extends BaseMapper<EmBiRepairDevice> {
+
+    List<Map> queryAll(@Param("query") DeviceUserQuery query);
+
+    List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.xml
new file mode 100644
index 00000000..8ec68568
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiRepairDeviceMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiRepairDeviceMapper">
+
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+        sys_user
+        <where>
+            is_used = '1'
+            <if test="query.username != null and query.username  != ''">
+                and username =  #{query.username}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryAllDevice" resultType="java.util.Map">
+        SELECT
+        device.device_code,
+        device.device_name,
+        use1.person_name,
+        mps.person_id
+        FROM
+        em_bi_repairpersondevice mps
+        LEFT JOIN em_bi_equipmentfile device ON device.device_code = mps.device_code
+        LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
+        <where>
+            mps.user_id =  #{query.user_id}
+        </where>
+
+    </select>
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java
new file mode 100644
index 00000000..764dd3bd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiRepairDeviceServiceImpl.java
@@ -0,0 +1,33 @@
+package org.nl.wms.masterdata_manage.service.em.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiRepairDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
+import org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiRepairDeviceMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Service
+public class EmBiRepairDeviceServiceImpl extends ServiceImpl<EmBiRepairDeviceMapper, EmBiRepairDevice> implements EmBiRepairDeviceService {
+
+    @Override
+    public List<Map> queryAll(DeviceUserQuery query) {
+        return this.baseMapper.queryAll(query);
+    }
+
+    @Override
+    public List<Map> queryAllDevice(DeviceUserQuery query) {
+        return this.baseMapper.queryAllDevice(query);
+    }
+}
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue
new file mode 100644
index 00000000..5553447c
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/SelectDeviceDialog.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <label class="el-form-item-label">设备搜索</label>
+    <el-input
+      v-model="query.device_code"
+      clearable
+      size="small"
+      placeholder="请输入设备编码或名称"
+      style="width: 220px;"
+      class="filter-item"
+    />
+    <rrOperation :crud="crud" />
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;margin-top: 15px"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @selection-change="crud.selectionChangeHandler"
+      @current-change="clickChange"
+    >
+      <el-table-column label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="device_code" label="设备编码" />
+      <el-table-column prop="device_name" label="设备名称" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
+
+export default {
+  name: 'SelectDeviceDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '设备选择', url: 'api/equipmentfile', crudMethod: { ...equipmentfile }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tableRadio: null,
+      dialogVisible: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    setForm(user_id) {
+      this.user_id = user_id
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.afterRefresh]() {
+      return true
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      if (this.tableRadio === null) {
+        this.$message('至少选择一条设备信息')
+        return
+      }
+      console.log(this.crud.selections)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged3', this.tableRadio)
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue
new file mode 100644
index 00000000..c5be0929
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/dictDetail.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div v-if="query.user_id === ''">
+      <div class="my-code">点击查看设备详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.label"
+            clearable
+            size="mini"
+            placeholder="输入字典标签查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="设备编码" prop="device_code">
+            <template scope="scope">
+              <el-input v-model="form.device_code" disabled style="width: 250px;" clearable >
+                <el-button slot="append" icon="el-icon-plus" @click="queryDevice(scope.$index, scope.row)" />
+              </el-input>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column label="所属人员" min-width="100" show-overflow-tooltip>
+          {{ query.person_name }}
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" align="center" width="120" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','dict:edit','dict:del']"
+          label="操作"
+          align="center"
+          width="115px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <SelectDeviceDialog ref="selectDeviceDialog" :dialog-show.sync="deviceShow" @tableChanged3="tableChanged3" />
+
+  </div>
+</template>
+
+<script>
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice'
+import CRUD, { form, header, presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+import SelectDeviceDialog from './SelectDeviceDialog'
+
+const defaultForm = {
+  device_code: null
+}
+
+export default {
+  components: { pagination, rrOperation, udOperation, SelectDeviceDialog },
+  cruds() {
+    return [
+      CRUD({
+        title: '设备详情',
+        url: 'api/embirepairdevice/device',
+        query: { code: '' },
+        idField: 'person_id',
+        sort: ['person_id,asc', 'person_id,desc'],
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      deviceShow: false,
+      rules: {
+        device_code: [
+          { required: true, message: '请输入设备号', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryDevice() {
+      this.deviceShow = true
+    },
+    tableChanged3(row) {
+      this.form.device_code = row.device_code
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue
new file mode 100644
index 00000000..6d50e54b
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!-- 字典列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="13" :sm="13" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.username" clearable size="mini" placeholder="输入人员名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" />
+          </div>
+          <!--表格渲染-->
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            :data="crud.data"
+            highlight-current-row
+            style="width: 100%;"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange">
+            <el-table-column prop="username" label="用户名" />
+            <el-table-column prop="person_name" label="名称" />
+            <el-table-column prop="gender" label="性别" />
+            <el-table-column prop="phone" label="手机号码" width="110" />
+            <el-table-column prop="email" label="邮箱" width="140" />
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 字典详情列表 -->
+      <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>设备详情</span>
+            <el-button
+              v-if="this.rowDtl !== null"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import dictDetail from './dictDetail.vue'
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice'
+
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = {}
+
+export default {
+  name: 'Repairpersondevice',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({
+        title: '维修人与设备档案维护',
+        url: 'api/embirepairdevice',
+        idField: 'jockey_id',
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: false,
+          edit: false,
+          del: false,
+          download: false,
+          reset: true
+        }
+      })
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      rowDtl: null,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        code: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    checkPermission,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.user_id = ''
+        this.rowDtl = null
+        this.$refs.dictDetail.crud.toQuery()
+      }
+      return true
+    },
+    // 选中字典后，设置字典详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.rowDtl = val
+        this.$refs.dictDetail.query.user_id = val.user_id
+        this.$refs.dictDetail.query.person_name = val.person_name
+        this.$refs.dictDetail.form.user_id = val.user_id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js
new file mode 100644
index 00000000..a07bdb1a
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/repairpersondevice/repairpersondevice.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/embirepairdevice',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/embirepairdevice/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/embirepairdevice',
+    method: 'put',
+    data
+  })
+}
+
+export function addPersons(data) {
+  return request({
+    url: 'api/embirepairdevice/addPersons',
+    method: 'post',
+    data
+  })
+}
+
+export function getHeader(data) {
+  return request({
+    url: 'api/embirepairdevice/getHeader',
+    method: 'post',
+    data
+  })
+}
+
+export function getDeviceIdByUserId(data) {
+  return request({
+    url: 'api/embirepairdevice/getDeviceIdByUserId',
+    method: 'post',
+    data
+  })
+}
+
+export function addDevices(data) {
+  return request({
+    url: 'api/embirepairdevice/addDevices',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteRow(data) {
+  return request({
+    url: 'api/embirepairdevice/deleteRow',
+    method: 'delete',
+    data
+  })
+}
+
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices }