diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java
index decfb53a..7f5982b7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java
@@ -30,36 +30,24 @@ public class DevicemaintenancemstController {
     private final DevicemaintenancemstService devicemaintenancemstService;
 
     @GetMapping
-    @ApiOperation("查询设备保养单(维修班)")
+    @ApiOperation("保养单维护查询")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK);
     }
 
     @GetMapping("/query")
-    @ApiOperation("查询设备保养单2")
+    @ApiOperation("保养单审核查询")
     public ResponseEntity<Object> query2(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicemaintenancemstService.query2(whereJson, page), HttpStatus.OK);
     }
 
 
     @GetMapping("query3")
-    @ApiOperation("查询设备保养单填报（维修班）")
+    @ApiOperation("保养单实施填报查询")
     public ResponseEntity<Object> query3(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK);
     }
 
-    @GetMapping("query4")
-    @ApiOperation("查询设备保养单(班组)")
-    public ResponseEntity<Object> query4(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(devicemaintenancemstService.query4(whereJson, page), HttpStatus.OK);
-    }
-
-    @GetMapping("query5")
-    @ApiOperation("查询设备保养单填报（班组）")
-    public ResponseEntity<Object> query5(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(devicemaintenancemstService.query5(whereJson, page), HttpStatus.OK);
-    }
-
     @PostMapping
     @ApiOperation("新增设备保养单")
     public ResponseEntity<Object> create(@RequestBody JSONObject whereJson) {
@@ -115,20 +103,6 @@ public class DevicemaintenancemstController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @PostMapping("/submitMain")
-    @ApiOperation("保养执行")
-    public ResponseEntity<Object> submitMain(@RequestBody JSONObject whereJson) {
-        devicemaintenancemstService.submitMain(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/confirmMaintain")
-    @ApiOperation("保养确认")
-    public ResponseEntity<Object> confirmMaintain(@RequestBody JSONObject whereJson) {
-        devicemaintenancemstService.confirmMaintain(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @PostMapping("/auditMaintain")
     @ApiOperation("审核")
     public ResponseEntity<Object> auditMaintain(@RequestBody JSONObject whereJson) {
@@ -136,10 +110,4 @@ public class DevicemaintenancemstController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @GetMapping("/createExcel")
-    @ApiOperation("下载Excel")
-    public ResponseEntity<Object> createExcel(@RequestParam Map whereJson, HttpServletResponse response) {
-        devicemaintenancemstService.createExcel(whereJson,response);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/DevicemaintenancemstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/DevicemaintenancemstService.java
index c52bad1d..fdda6947 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/DevicemaintenancemstService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/DevicemaintenancemstService.java
@@ -116,13 +116,6 @@ public interface DevicemaintenancemstService {
      */
     void submitMain(JSONObject whereJson);
 
-    /**
-     * 保养确认
-     *
-     * @param whereJson /
-     */
-    void confirmMaintain(JSONObject whereJson);
-
     /**
      * 审核
      *
@@ -130,13 +123,6 @@ public interface DevicemaintenancemstService {
      */
     void auditMaintain(JSONObject whereJson);
 
-    /**
-     * 下载excel
-     *
-     * @param whereJson /
-     */
-    void createExcel(Map whereJson, HttpServletResponse response);
-
     /**
      * 查询数据分页
      *
@@ -146,21 +132,4 @@ public interface DevicemaintenancemstService {
      */
     Map<String, Object> query3(Map whereJson, Pageable page);
 
-    /**
-     * 查询数据分页
-     *
-     * @param whereJson 条件
-     * @param page      分页参数
-     * @return Map<String, Object>
-     */
-    Map<String, Object> query4(Map whereJson, Pageable page);
-
-    /**
-     * 查询数据分页
-     *
-     * @param whereJson 条件
-     * @param page      分页参数
-     * @return Map<String, Object>
-     */
-    Map<String, Object> query5(Map whereJson, Pageable page);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
index 21e65fdd..bfa55615 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
@@ -156,7 +156,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("invstatus", "01");
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
-        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         jsonMst.put("input_optid", currentUserId);
         jsonMst.put("input_optname", nickName);
@@ -191,7 +190,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("devicerecord_id", whereJson.get("devicerecord_id"));
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
-        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         mstTab.update(jsonMst);
 
@@ -373,39 +371,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void confirmMaintain(JSONObject whereJson) {
-        String maint_id = whereJson.getString("maint_id");
-        Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
-        String nickName = SecurityUtils.getCurrentNickName();
-
-        WQLObject mstTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceMst");
-        WQLObject dtlTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceDtl");
-
-        JSONObject jsonMst = mstTab.query("maint_id = '" + maint_id + "'").uniqueResult(0);
-
-        // 1.明细中的是否完成 ：必须为全部完成
-        JSONArray dtlArr = dtlTab.query("maint_id = '" + maint_id + "'").getResultJSONArray(0);
-        for (int i = 0; i < dtlArr.size(); i++) {
-            JSONObject json = dtlArr.getJSONObject(i);
-            if (StrUtil.equals(json.getString("isfinish"), "0")) throw new BadRequestException("保养项目未完成");
-        }
-
-        // 2.保养人，保养时间不能为空
-        String update_optname = jsonMst.getString("update_optname");
-        String update_time = jsonMst.getString("update_time");
-        if (ObjectUtil.isEmpty(update_optname) || ObjectUtil.isEmpty(update_time))
-            throw new BadRequestException("保养人或保养时间不能为空");
-
-        // 3.更新主表
-        jsonMst.put("invstatus", "05");
-        jsonMst.put("confirm_optid", currentUserId);
-        jsonMst.put("confirm_optname", nickName);
-        jsonMst.put("confirm_time", DateUtil.now());
-        mstTab.update(jsonMst);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void auditMaintain(JSONObject whereJson) {
@@ -422,6 +387,9 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("audit_optid", currentUserId);
         jsonMst.put("audit_optname", nickName);
         jsonMst.put("audit_time", DateUtil.now());
+        jsonMst.put("confirm_optid", currentUserId);
+        jsonMst.put("confirm_optname", nickName);
+        jsonMst.put("confirm_time", DateUtil.now());
         mstTab.update(jsonMst);
 
         // 2.根据来源标识 ： 为空不处理、否则更新设备保养计划表
@@ -439,88 +407,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void createExcel(Map whereJson, HttpServletResponse response) {
-
-      /*  String maint_id = MapUtil.getStr(whereJson, "maint_id");
-        WQLObject mainMstTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceMst"); // 设备保养主表
-        try {
-
-            JSONObject jsonMainMst = mainMstTab.query("maint_id ='" + maint_id + "'").uniqueResult(0);
-
-            HashMap<String, String> paramMap1 = new HashMap<>();
-            paramMap1.put("flag", "1");
-            paramMap1.put("devicerecord_id", jsonMainMst.getString("devicerecord_id"));
-
-            JSONObject jsonFile = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN002").addParamMap(paramMap1).process().uniqueResult(0);
-
-            String template = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MAIN_EXCEL_PATH").getValue();
-            // 设置文件名和防止乱码现象
-            String fileName = URLEncoder.encode("eee", "UTF-8");
-            response.setHeader("Content-Disposition", "attachment; filename*=UTf-8''" + fileName + ".xlsx");
-            // 获取输出流
-            ServletOutputStream outputStream = response.getOutputStream();
-            // 创建模板工作簿
-            ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(template).build();
-            // 获取第一个sheet
-            WriteSheet sheet = EasyExcel.writerSheet().build();
-
-            // 1.准备数据 - 单组填充
-            HashMap<String, String> sheetMap = new HashMap<>();
-            sheetMap.put("input_time", jsonMainMst.getString("input_time").substring(0, 10)); // 时间
-            sheetMap.put("plan_start_date", jsonMainMst.getString("plan_start_date").substring(0, 10)); // 计划日期
-            sheetMap.put("real_start_date", jsonMainMst.getString("real_start_date").substring(0, 10));
-            // 计划日期
-            sheetMap.put("update_optname1", jsonMainMst.getString("update_optname"));
-            sheetMap.put("update_optname2", jsonMainMst.getString("update_optname"));
-            sheetMap.put("update_optname3", jsonMainMst.getString("update_optname"));
-
-            sheetMap.put("confirm_optname", jsonMainMst.getString("confirm_optname"));
-            sheetMap.put("confirm_optname2", jsonMainMst.getString("confirm_optname"));
-
-            sheetMap.put("audit_optname", jsonMainMst.getString("audit_optname"));
-            if (ObjectUtil.isNotEmpty(jsonFile)) {
-                sheetMap.put("device_name", jsonFile.getString("device_name")); // 设备名称
-                sheetMap.put("extend_code", jsonFile.getString("extend_code")); // 出厂编号
-                sheetMap.put("device_model", jsonFile.getString("device_model")); // 型号
-                sheetMap.put("dept_name", jsonFile.getString("dept_name")); // 班组
-            }
-
-            // 2.准备数据 - 多组填充
-            HashMap<String, String> paramMap2 = new HashMap<>();
-            paramMap2.put("flag", "2");
-            paramMap2.put("maint_id", maint_id);
-
-            JSONArray jsonMainDtlArr = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN002").addParamMap(paramMap2).process().getResultJSONArray(0);
-            ArrayList<HashMap<String, Object>> data1 = new ArrayList<>();
-            ArrayList<HashMap<String, Object>> data2 = new ArrayList<>();
-
-            if (ObjectUtil.isNotEmpty(jsonMainDtlArr)) {
-                for (int i = 0; i < jsonMainDtlArr.size(); i++) {
-                    JSONObject json = jsonMainDtlArr.getJSONObject(i);
-                    HashMap<String, Object> dataMap1 = new HashMap<>();
-                    HashMap<String, Object> dataMap2 = new HashMap<>();
-                    dataMap1.put("contents", String.valueOf(i+1) + "." + json.getString("contents"));
-                    dataMap2.put("acceptancecriteria", String.valueOf(i+1) + "." + json.getString("acceptancecriteria"));
-                    data1.add(dataMap1);
-                    data2.add(dataMap2);
-                }
-            }
-
-            // 下载
-            workBook.fill(sheetMap, sheet);
-            workBook.fill(new FillWrapper("data1", data1), sheet);
-            workBook.fill(new FillWrapper("data2", data2), sheet);
-            workBook.finish();
-
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-            throw new BadRequestException("下载异常");
-        }*/
-
-    }
-
     @Override
     public Map<String, Object> query3(Map whereJson, Pageable page) {
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -531,7 +417,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         String invstatus = MapUtil.getStr(whereJson, "invstatus");
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         String end_time = MapUtil.getStr(whereJson, "end_time");
-        String maint_object = MapUtil.getStr(whereJson, "maint_object");
 
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "4");
@@ -539,7 +424,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         map.put("invstatus", invstatus);
         map.put("begin_time", begin_time);
         map.put("end_time", end_time);
-        map.put("maint_object", maint_object);
         if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
         if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
         //处理物料当前节点的所有子节点
@@ -555,82 +439,4 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         return json;
     }
 
-    @Override
-    public Map<String, Object> query4(Map whereJson, Pageable page) {
-        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
-        String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
-        String device_code = MapUtil.getStr(whereJson, "device_code");
-        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
-        String maint_code = MapUtil.getStr(whereJson, "maint_code");
-        String invstatus = MapUtil.getStr(whereJson, "invstatus");
-        String begin_time = MapUtil.getStr(whereJson, "begin_time");
-        String end_time = MapUtil.getStr(whereJson, "end_time");
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("flag", "5");
-        map.put("maintenancecycle", maintenancecycle);
-        map.put("invstatus", invstatus);
-        map.put("begin_time", begin_time);
-        map.put("end_time", end_time);
-        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
-        if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
-        //处理物料当前节点的所有子节点
-        if (!StrUtil.isEmpty(material_type_id)) {
-            map.put("material_type_id", material_type_id);
-            String classIds = classstandardService.getChildIdStr(material_type_id);
-            map.put("classIds", classIds);
-        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
-            String classIds = classstandardService.getAllChildIdStr(class_idStr);
-            map.put("classIds", classIds);
-        }
-        // 归属部门
-        String dept_id = MapUtil.getStr(whereJson, "dept_id");
-        if (!StrUtil.isEmpty(dept_id)) {
-            String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
-            map.put("deptIds", deptIds);
-        }
-        JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
-        return json;
-    }
-
-    @Override
-    public Map<String, Object> query5(Map whereJson, Pageable page) {
-        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
-        String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
-        String device_code = MapUtil.getStr(whereJson, "device_code");
-        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
-        String maint_code = MapUtil.getStr(whereJson, "maint_code");
-        String invstatus = MapUtil.getStr(whereJson, "invstatus");
-        String begin_time = MapUtil.getStr(whereJson, "begin_time");
-        String end_time = MapUtil.getStr(whereJson, "end_time");
-        String maint_object = MapUtil.getStr(whereJson, "maint_object");
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("flag", "6");
-        map.put("maintenancecycle", maintenancecycle);
-        map.put("invstatus", invstatus);
-        map.put("begin_time", begin_time);
-        map.put("end_time", end_time);
-        map.put("maint_object", maint_object);
-        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
-        if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
-        //处理物料当前节点的所有子节点
-        if (!StrUtil.isEmpty(material_type_id)) {
-            map.put("material_type_id", material_type_id);
-            String classIds = classstandardService.getChildIdStr(material_type_id);
-            map.put("classIds", classIds);
-        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
-            String classIds = classstandardService.getAllChildIdStr(class_idStr);
-            map.put("classIds", classIds);
-        }
-        // 归属部门
-        String dept_id = MapUtil.getStr(whereJson, "dept_id");
-        if (!StrUtil.isEmpty(dept_id)) {
-            String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
-            map.put("deptIds", deptIds);
-        }
-        JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
-        return json;
-    }
-
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql
index 68512430..9002f84b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN_01.wql
@@ -117,7 +117,7 @@
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
             	LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
             WHERE
                 file.is_delete = '0'
                 AND file.status not in (90,91)
@@ -173,7 +173,7 @@
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
             	LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
             WHERE
                 file.is_delete = '0'
                 AND file.status not in (90,91)
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql
index bada5302..e2b2bf32 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql
@@ -64,11 +64,10 @@
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.maint_object = '02'
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
@@ -119,7 +118,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus in ('05','99')
+                AND mst.invstatus in ('04','99')
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
@@ -193,11 +192,10 @@
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.maint_object = '02'
                 AND mst.invstatus in ('02','03')
 
                 OPTION 输入.device_code <> ""
@@ -218,10 +216,6 @@
                     mst.maintenancecycle = 输入.maintenancecycle
                 ENDOPTION
 
-                OPTION 输入.maint_object <> ""
-                    mst.maint_object = 输入.maint_object
-                ENDOPTION
-
                 OPTION 输入.begin_time <> ""
                     mst.plan_start_date >= 输入.begin_time
                 ENDOPTION
@@ -249,11 +243,10 @@
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.maint_object = '01'
                 AND mst.invstatus in ('04')
 
                 OPTION 输入.device_code <> ""
@@ -274,10 +267,6 @@
                     mst.maintenancecycle = 输入.maintenancecycle
                 ENDOPTION
 
-                OPTION 输入.maint_object <> ""
-                    mst.maint_object = 输入.maint_object
-                ENDOPTION
-
                 OPTION 输入.begin_time <> ""
                     mst.plan_start_date >= 输入.begin_time
                 ENDOPTION
@@ -292,183 +281,4 @@
 
 			ENDSELECT
 		ENDPAGEQUERY
-	ENDIF
-
-	IF 输入.flag = "5"
-		PAGEQUERY
-			SELECT
-            	mst.*,
-            	class.class_name,
-            	file.device_code,
-            	file.material_type_id,
-            	file.device_name,
-            	file.extend_code,
-                d1.name AS dept_name,
-                d2.name AS use_name
-            FROM
-            	EM_BI_DeviceMaintenanceMst mst
-            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
-            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
-                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
-            WHERE
-                mst.is_delete = '0'
-                AND file.is_delete = '0'
-                AND mst.maint_object = '01'
-
-                OPTION 输入.device_code <> ""
-                    (file.device_code like 输入.device_code or
-                    file.device_name like 输入.device_code)
-                ENDOPTION
-
-                OPTION 输入.maint_code <> ""
-                    (mst.maint_code like 输入.maint_code or
-                    mst.maint_code like 输入.maint_code)
-                ENDOPTION
-                OPTION 输入.deptIds <> ""
-                    d2.dept_id in 输入.deptIds
-                ENDOPTION
-                OPTION 输入.classIds <> ""
-                    class.class_id in 输入.classIds
-                ENDOPTION
-
-                OPTION 输入.maintenancecycle <> ""
-                    mst.maintenancecycle = 输入.maintenancecycle
-                ENDOPTION
-
-                OPTION 输入.begin_time <> ""
-                    mst.plan_start_date >= 输入.begin_time
-                ENDOPTION
-
-                OPTION 输入.end_time <> ""
-                    mst.plan_start_date <= 输入.end_time
-                ENDOPTION
-
-                OPTION 输入.invstatus <> ""
-                    mst.invstatus = 输入.invstatus
-                ENDOPTION
-
-			ENDSELECT
-		ENDPAGEQUERY
-	ENDIF
-
-	IF 输入.flag = "6"
-		PAGEQUERY
-			SELECT
-            	mst.*,
-            	class.class_name,
-            	file.device_code,
-            	file.device_name,
-            	file.extend_code,
-                d1.name AS dept_name,
-                d2.name AS use_name
-            FROM
-            	EM_BI_DeviceMaintenanceMst mst
-            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
-            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
-                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
-            WHERE
-                mst.is_delete = '0'
-                AND file.is_delete = '0'
-                AND mst.maint_object = '01'
-                AND mst.invstatus in ('02','03')
-
-                OPTION 输入.device_code <> ""
-                    (file.device_code like 输入.device_code or
-                    file.device_name like 输入.device_code)
-                ENDOPTION
-
-                OPTION 输入.maint_code <> ""
-                    (mst.maint_code like 输入.maint_code or
-                    mst.maint_code like 输入.maint_code)
-                ENDOPTION
-
-                OPTION 输入.classIds <> ""
-                    class.class_id in 输入.classIds
-                ENDOPTION
-                OPTION 输入.deptIds <> ""
-                    d2.dept_id in 输入.deptIds
-                ENDOPTION
-                OPTION 输入.maintenancecycle <> ""
-                    mst.maintenancecycle = 输入.maintenancecycle
-                ENDOPTION
-
-                OPTION 输入.maint_object <> ""
-                    mst.maint_object = 输入.maint_object
-                ENDOPTION
-
-                OPTION 输入.begin_time <> ""
-                    mst.plan_start_date >= 输入.begin_time
-                ENDOPTION
-
-                OPTION 输入.end_time <> ""
-                    mst.plan_start_date <= 输入.end_time
-                ENDOPTION
-
-                OPTION 输入.invstatus <> ""
-                    mst.invstatus = 输入.invstatus
-                ENDOPTION
-
-            UNION
-
-			SELECT
-            	mst.*,
-            	class.class_name,
-            	file.device_code,
-            	file.device_name,
-            	file.extend_code,
-                d1.name AS dept_name,
-                d2.name AS use_name
-            FROM
-            	EM_BI_DeviceMaintenanceMst mst
-            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
-            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
-                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
-                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
-            WHERE
-                mst.is_delete = '0'
-                AND file.is_delete = '0'
-                AND mst.maint_object = '02'
-                AND mst.invstatus in ('04')
-
-                OPTION 输入.device_code <> ""
-                    (file.device_code like 输入.device_code or
-                    file.device_name like 输入.device_code)
-                ENDOPTION
-
-                OPTION 输入.maint_code <> ""
-                    (mst.maint_code like 输入.maint_code or
-                    mst.maint_code like 输入.maint_code)
-                ENDOPTION
-
-                OPTION 输入.classIds <> ""
-                    class.class_id in 输入.classIds
-                ENDOPTION
-
-                OPTION 输入.maintenancecycle <> ""
-                    mst.maintenancecycle = 输入.maintenancecycle
-                ENDOPTION
-
-                OPTION 输入.maint_object <> ""
-                    mst.maint_object = 输入.maint_object
-                ENDOPTION
-
-                OPTION 输入.begin_time <> ""
-                    mst.plan_start_date >= 输入.begin_time
-                ENDOPTION
-
-                OPTION 输入.end_time <> ""
-                    mst.plan_start_date <= 输入.end_time
-                ENDOPTION
-
-                OPTION 输入.invstatus <> ""
-                    mst.invstatus = 输入.invstatus
-                ENDOPTION
-
-			ENDSELECT
-		ENDPAGEQUERY
-	ENDIF
-
-
-
+	ENDIF
\ No newline at end of file
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java
index dbbb4cb4..035eae9c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java
@@ -219,15 +219,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
                 if (!"11,00".contains(nowStatus)) {
                     throw new BadRequestException("只有停用、生成状态才可启用！");
                 }
-                if (StrUtil.isEmpty(jsonMst.getString("device_bom_id"))) {
-                    throw new BadRequestException("设备BOM不能为空！");
-                }
                 if (StrUtil.isEmpty(jsonMst.getString("use_deptid"))) {
                     throw new BadRequestException("使用部门不能为空！");
                 }
-                if (StrUtil.isEmpty(jsonMst.getString("use_groupid"))) {
-                    throw new BadRequestException("使用班组不能为空！");
-                }
                 if (StrUtil.isEmpty(jsonMst.getString("user_name"))) {
                     throw new BadRequestException("使用人不能为空！");
                 }
diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue
index 0e96505c..4552cd2b 100644
--- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue
@@ -185,21 +185,6 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="设备BOM" prop="device_bom_id">
-        <el-select
-          v-model="form.device_bom_id"
-          placeholder="设备BOM"
-          style="width: 210px"
-          class="filter-item"
-        >
-          <el-option
-            v-for="item in bomlist"
-            :key="item.device_bom_id"
-            :label="item.material_name"
-            :value="item.device_bom_id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="卡片编号" prop="card_code">
         <label slot="label">卡片编号:</label>
         <el-input v-model.trim="form.card_code" clearable style="width: 210px" />
@@ -254,7 +239,6 @@ import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/eq
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudDept from '@/views/system/dept/dept'
-// import crudDevicebom from '@/api/wms/basedata/em/devicebom'
 
 const defaultForm = {
   devicerecord_id: '',
@@ -377,23 +361,6 @@ export default {
           this.class_idStr = res.class_idStr
           this.queryClassId()
         })
-        equipmentfile.queryBomList({ material_type_id: '-1' }).then(res => {
-          this.bomlist = res
-        })
-      } else {
-        equipmentfile.queryBomList({ material_type_id: form.material_type_id }).then(res => {
-          this.bomlist = res
-        })
-        this.getSupDepts(form.use_deptid)
-        const param = {
-          'materOpt_code': '26'
-        }
-        crudDevicebom.getBjId(param).then(res => {
-          const data = {}
-          data.id = form.material_type_id
-          data.goal_id = res.class_idStr
-          this.getSubTypes(data)
-        })
       }
     },
     queryClassId() {
@@ -453,12 +420,6 @@ export default {
         children: node.children
       }
     },
-    typeChange(old) {
-      /*this.form.device_bom_id = ''
-      equipmentfile.queryBomList({ material_type_id: old.class_id }).then(res => {
-        this.bomlist = res
-      })*/
-    },
     [CRUD.HOOK.beforeSubmit]() {
     }
   }
diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog.vue
index 789b439b..bd77394e 100644
--- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog.vue
@@ -19,9 +19,9 @@
         <label slot="label">设备名称:</label>
         <el-input v-model.trim="form.device_name" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="使用班组" prop="use_groupname">
-        <label slot="label">使用班组:</label>
-        <el-input v-model.trim="form.use_groupname" disabled style="width: 210px" />
+      <el-form-item label="使用部门" prop="use_deptname">
+        <label slot="label">使用部门:</label>
+        <el-input v-model.trim="form.use_deptname" disabled style="width: 210px" />
       </el-form-item>
       <el-form-item label="归属部门" prop="belong_deptname">
         <label slot="label">归属部门:</label>
@@ -29,29 +29,6 @@
       </el-form-item>
     </el-form>
     <el-tabs type="card">
-      <el-tab-pane label="备品备件" name="first">
-        <!--表格渲染-->
-        <el-table
-          ref="table2"
-          :data="tableDtl2"
-          style="width: 100%;"
-          max-height="400"
-          size="mini"
-          border
-          :highlight-current-row="true"
-          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        >
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column min-width="150" prop="sparepart_only_id" label="备件编码" align="center" />
-          <el-table-column min-width="120" prop="material_code" label="物料编码" align="center" />
-          <el-table-column min-width="80" prop="material_name" label="物料名称" align="center" />
-          <el-table-column min-width="80" prop="class_code" label="分类编码" align="center" />
-          <el-table-column min-width="120" prop="class_name" label="分类名称" align="center" />
-          <el-table-column prop="last_change" label="上次更换时间" width="120px" />
-          <el-table-column prop="current_change" label="本次更换时间" width="120px" />
-          <el-table-column prop="interval_time" label="更换间隔" width="120px" />
-        </el-table>
-      </el-tab-pane>
       <el-tab-pane label="文档管理" name="second">
         <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload2">新增文档</el-button>
         <!--表格渲染-->
@@ -114,156 +91,10 @@
           <el-table-column prop="changetype" label="变更类型名称" align="center" width="120px" :formatter="device_typeFormat" />
           <el-table-column min-width="120" prop="change_reason" label="变更内容" align="center" />
           <el-table-column min-width="80" prop="change_name" label="操作人" align="center" />
-          <el-table-column min-width="80" prop="invtype" label="源单类型" align="center" :formatter="inv_typeFormat" />
-          <el-table-column min-width="120" prop="invcode" label="源单号" align="center">
-            <template slot-scope="scope">
-              <el-link type="warning" @click="toView(scope.row)">{{ scope.row.invcode }}</el-link>
-            </template>
-          </el-table-column>
+          <el-table-column min-width="120" prop="invcode" label="源单号" align="center" />
           <el-table-column min-width="120" prop="change_content" label="备注" align="center" />
         </el-table>
       </el-tab-pane>
-
-      <el-tab-pane label="维修计划" name="third1">
-        <!--表格渲染-->
-        <el-table
-          ref="table4"
-          :data="tableDtl4"
-          style="width: 100%;"
-          max-height="400"
-          size="mini"
-          border
-          :highlight-current-row="true"
-          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        >
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="repair_plan_code" label="计划单号" width="120px" />
-          <el-table-column prop="repair_plan_name" label="计划名称" show-overflow-tooltip />
-          <el-table-column prop="class_name" label="设备类型" />
-          <el-table-column prop="device_code" label="设备编号" show-overflow-tooltip />
-          <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
-          <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
-          <el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
-          <el-table-column prop="repair_type" label="维修类型" :formatter="formatRepairpType" />
-          <el-table-column prop="is_active" label="是否启用" :formatter="format_is_active" />
-          <el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
-          <el-table-column prop="real_start_date" label="实际开始日期" width="120px" />
-          <el-table-column prop="real_end_date" label="实际结束日期" width="120px" />
-          <el-table-column prop="create_name" label="创建人" />
-          <el-table-column prop="create_time" label="创建时间" width="150px" />
-          <el-table-column prop="confirm_optname" label="审核人" />
-          <el-table-column prop="confirm_time" label="审核时间" width="150px" />
-          <el-table-column prop="remark" label="备注" show-overflow-tooltip />
-        </el-table>
-      </el-tab-pane>
-
-      <el-tab-pane label="保养计划" name="third2">
-        <!--表格渲染-->
-        <el-table
-          ref="table5"
-          :data="tableDtl5"
-          style="width: 100%;"
-          max-height="400"
-          size="mini"
-          border
-          :highlight-current-row="true"
-          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        >
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="maint_plan_code" label="保养计划单号" width="120px" />
-          <el-table-column prop="maint_plan_name" label="保养计划名称" width="120px" />
-          <el-table-column prop="class_name" label="设备类型" width="120px" />
-          <el-table-column prop="device_code" label="设备编码" />
-          <el-table-column prop="device_name" label="设备名称" />
-          <el-table-column prop="extend_code" label="设备自编码" width="90px" />
-          <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName" />
-          <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" />
-          <el-table-column prop="detail_count" label="明细数" />
-          <el-table-column prop="is_active" label="是否启用" :formatter="format_is_active" />
-          <el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
-          <el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
-          <el-table-column prop="real_end_date" label="实际结束日期" width="150px" />
-          <el-table-column prop="remark" label="备注" />
-          <el-table-column prop="create_name" label="创建人" />
-          <el-table-column prop="create_time" label="创建时间" width="150px" />
-          <el-table-column prop="confirm_optname" label="审核人" />
-          <el-table-column prop="confirm_time" label="审核时间" width="150px" />
-        </el-table>
-      </el-tab-pane>
-
-      <el-tab-pane label="维修单" name="third3">
-        <!--表格渲染-->
-        <el-table
-          ref="table6"
-          :data="tableDtl6"
-          style="width: 100%;"
-          max-height="400"
-          size="mini"
-          border
-          :highlight-current-row="true"
-          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        >
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="repair_code" label="维修单号" width="120px" />
-          <el-table-column prop="device_code" label="设备编码" width="120px" />
-          <el-table-column prop="device_name" label="设备名称" />
-          <el-table-column prop="extend_code" label="设备自编码" width="90px" />
-          <el-table-column prop="dept_name" label="归属部门" />
-          <el-table-column prop="use_name" label="使用班组" />
-          <el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName" />
-          <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" />
-          <el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName" />
-          <el-table-column prop="plan_start_date" label="计划维修日期" width="120px" />
-          <el-table-column prop="fault_desc" label="故障描述" />
-          <el-table-column prop="remark" label="备注" />
-          <el-table-column prop="input_optname" label="制单人" />
-          <el-table-column prop="input_time" label="制单时间" width="150px" />
-          <el-table-column prop="update_optname" label="维修人" />
-          <el-table-column prop="real_start_date" label="开始时间" width="150px" />
-          <el-table-column prop="real_end_date" label="结束时间" width="150px" />
-          <el-table-column prop="confirm_optname" label="确认人" />
-          <el-table-column prop="confirm_time" label="确认时间" width="150px" />
-          <el-table-column prop="audit_optname" label="审核人" />
-          <el-table-column prop="audit_time" label="审核时间" width="150px" />
-          <el-table-column prop="source_bill_code" label="源单号" />
-          <el-table-column prop="source_bill_type" label="源单业务类型" width="120px" />
-        </el-table>
-      </el-tab-pane>
-
-      <el-tab-pane label="保养单" name="third4">
-        <!--表格渲染-->
-        <el-table
-          ref="table7"
-          :data="tableDtl7"
-          style="width: 100%;"
-          max-height="400"
-          size="mini"
-          border
-          :highlight-current-row="true"
-          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-        >
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="maint_code" label="保养单号" width="120px" />
-          <el-table-column prop="device_code" label="设备编码" />
-          <el-table-column prop="device_name" label="设备名称" />
-          <el-table-column prop="extend_code" label="设备自编码" width="90px" />
-          <el-table-column prop="dept_name" label="归属部门" />
-          <el-table-column prop="use_name" label="使用班组" />
-          <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" />
-          <el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" />
-          <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
-          <el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />
-          <el-table-column prop="input_optname" label="创建人" />
-          <el-table-column prop="input_time" label="创建时间" width="150px" />
-          <el-table-column prop="update_optname" label="保养人" />
-          <el-table-column prop="real_start_date" label="开始时间" width="150px" />
-          <el-table-column prop="real_end_date" label="结束时间" width="150px" />
-          <el-table-column prop="confirm_optname" label="确认人" />
-          <el-table-column prop="confirm_time" label="确认时间" width="150px" />
-          <el-table-column prop="audit_optname" label="审核人" />
-          <el-table-column prop="audit_time" label="审核时间" width="150px" />
-        </el-table>
-      </el-tab-pane>
     </el-tabs>
 
     <!--    质保书上传弹出框-->
@@ -311,8 +142,6 @@ import ViewDialog2 from '@/views/wms/device_manage/deviceFile/equipmentfile/View
 import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import CRUD, { crud } from '@crud/crud'
-// import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst'
-// import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
 
 export default {
   name: 'ChangeDialog',
@@ -474,28 +303,6 @@ export default {
     submitUpload2() {
       this.dialogVisible2 = true
     },
-    toView(row) {
-      debugger
-      if (row.invcode.includes('WXD')) {
-        const data = {
-          'id': row.invcode
-        }
-        crudDevicerepairmst.findByCode(data).then(res => {
-          this.mstrow = res
-          this.mstrow.device_code = this.form.device_code
-          this.viewShow1 = true
-        })
-      } else {
-        const data = {
-          'id': row.invcode
-        }
-        crudDevicemaintenancemst.findByCode(data).then(res => {
-          this.mstrow = res
-          this.mstrow.device_code = this.form.device_code
-          this.viewShow2 = true
-        })
-      }
-    },
     deleteRow(index, row) {
       localStorage.del([row.storage_id]).then(res => {
         equipmentfile.queryivt3(this.form).then(res => {
@@ -508,6 +315,7 @@ export default {
       })
     },
     inv_typeFormat(row) {
+      debugger
       if (row.invcode.includes('WXD')) {
         return this.dict.label.EM_DEVICE_WX_INVTYPE[row.invtype]
       } else {
diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue
index 21cbc40f..d62dd78c 100644
--- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue
@@ -91,10 +91,6 @@
         <label slot="label">使用部门:</label>
         <el-input v-model.trim="form.use_deptname" disabled style="width: 210px" />
       </el-form-item>
-      <el-form-item label="使用班组" prop="use_groupid">
-        <label slot="label">使用班组:</label>
-        <el-input v-model.trim="form.use_groupname" disabled style="width: 210px" />
-      </el-form-item>
       <el-form-item label="设备属性" prop="device_type">
         <el-select
           v-model="form.device_type"
@@ -174,22 +170,6 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="设备BOM" prop="device_bom_id">
-        <el-select
-          v-model="form.device_bom_id"
-          placeholder="设备BOM"
-          disabled
-          style="width: 210px"
-          class="filter-item"
-        >
-          <el-option
-            v-for="item in bomlist"
-            :key="item.device_bom_id"
-            :label="item.material_name"
-            :value="item.device_bom_id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="卡片编号" prop="card_code">
         <label slot="label">卡片编号:</label>
         <el-input v-model.trim="form.card_code" disabled style="width: 210px" />
@@ -235,7 +215,6 @@
 <script>
 
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
-import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
 
 export default {
   name: 'ViewDialog',
@@ -280,11 +259,6 @@ export default {
       this.$emit('update:dialogShow', false)
       this.form = {}
       this.$emit('AddChanged')
-    },
-    open() {
-      equipmentfile.queryBomList({ material_type_id: this.form.material_type_id }).then(res => {
-        this.bomlist = res
-      })
     }
   }
 }
diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue
index 652567fb..61d6527e 100644
--- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue
+++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue
@@ -185,16 +185,6 @@
         >
           档案维护
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="printCard"
-        >
-          打印
-        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -238,31 +228,30 @@
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column fixed="left" prop="device_name" min-width="150" label="设备名称" />
-        <el-table-column fixed="left" prop="extend_code" min-width="100" label="内部自编号" />
-        <el-table-column fixed="left" prop="device_model" min-width="130" label="设备型号" />
-        <el-table-column fixed="left" prop="device_spec" min-width="130" label="设备规格" />
-        <el-table-column fixed="left" prop="device_level" min-width="70" label="设备等级" :formatter="device_levelFormat" />
-        <el-table-column fixed="left" prop="material_type_name" min-width="150" label="设备类别" />
-        <el-table-column fixed="left" :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" />
-        <el-table-column fixed="left" :formatter="stateFormat" min-width="70" prop="status" label="设备状态" />
-        <el-table-column prop="beginuse_date" min-width="90" label="启用日期" />
-        <el-table-column prop="use_deptname" min-width="130" label="使用部门" />
-        <el-table-column prop="use_groupname" min-width="130" label="使用班组" />
-        <el-table-column prop="supplier_name" min-width="180" label="供应商"  />
-        <el-table-column prop="manufacturer" min-width="180" label="制造商"  />
-        <el-table-column prop="country_manufactur" min-width="90" label="制造国别" />
-        <el-table-column prop="leavefactory_date" min-width="80" label="出厂日期"  />
-        <el-table-column prop="leavefactory_number" min-width="130" label="出厂编号"  />
-        <el-table-column prop="drawing_number" min-width="130" label="图号"  />
-        <el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat"  />
-        <el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2"  />
-        <el-table-column prop="assets_code" min-width="100" label="资产编码"  />
-        <el-table-column prop="assets_name" min-width="150" label="资产名称"  />
-        <el-table-column prop="create_name" min-width="90" label="生成人"  />
-        <el-table-column prop="create_time" min-width="140" label="生成时间"  />
-        <el-table-column prop="update_optname" min-width="90" label="修改人"  />
-        <el-table-column prop="update_time" min-width="140" label="修改时间"  />
+        <el-table-column prop="device_name" min-width="150" label="设备名称" />
+        <el-table-column prop="extend_code" min-width="100" label="内部自编号" />
+        <el-table-column prop="device_model" min-width="130" label="设备型号" />
+        <el-table-column prop="device_spec" min-width="130" label="设备规格" />
+        <el-table-column prop="device_level" min-width="90" label="设备等级" :formatter="device_levelFormat" />
+        <el-table-column prop="material_type_name" min-width="150" label="设备类别" />
+        <el-table-column :formatter="is_produceuseFormat" min-width="90" prop="is_produceuse" label="生产用途" />
+        <el-table-column :formatter="stateFormat" min-width="90" prop="status" label="设备状态" />
+        <el-table-column prop="beginuse_date" min-width="90" label="启用日期" show-overflow-tooltip />
+        <el-table-column prop="use_deptname" min-width="150" label="使用部门" show-overflow-tooltip />
+        <el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip />
+        <el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip />
+        <el-table-column prop="country_manufactur" min-width="90" label="制造国别" show-overflow-tooltip />
+        <el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip />
+        <el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip />
+        <el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip />
+        <el-table-column prop="device_type" min-width="90" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip />
+        <el-table-column prop="workprocedure_id" min-width="100" label="工序" :formatter="seriesFormat2" show-overflow-tooltip />
+        <el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip />
+        <el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip />
+        <el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip />
+        <el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip />
+        <el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip />
+        <el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -283,11 +272,9 @@ import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/AddDialog'
 import ViewDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog'
 import ChangeDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog'
-import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-// import { getDepts } from '@/api/system/dept'
 import crudDept, { getDeptTree } from '@/views/system/dept/dept'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
@@ -522,29 +509,6 @@ export default {
         }
         return stylejson
       }
-    },
-    printCard() {
-      const _selectData = this.$refs.table.selection
-      if (_selectData.length > 1 || _selectData.length === 0) {
-        return this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
-      }
-      const data = _selectData[0]
-      const LODOP = getLodop()
-
-      LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
-      // 打印纸张大小设置https://www.it610.com/article/2094844.html
-      LODOP.PRINT_INIT('')
-      LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
-      LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-      LODOP.SET_PRINT_STYLE('FontSize', 12)
-      LODOP.SET_PRINT_STYLE('Bold', 1)
-      LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
-      LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
-      LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
-      LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
-      LODOP.PRINT()// 打印
-      this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      this.crud.toQuery()
     }
   }
 }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
index eec6f5f2..0621c722 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
@@ -60,21 +60,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="保养对象" prop="maint_object">
-            <el-select
-              v-model="form.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in objectList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注" prop="remark">
@@ -176,9 +161,6 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
-      objectList: [
-        { 'label': '维修班', 'value': '02' }
-      ],
       rules: {
         plan_start_date: [
           { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -188,9 +170,6 @@ export default {
         ],
         devicerecord_id: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
-        ],
-        maint_object: [
-          { required: true, message: '保养对象不能为空', trigger: 'blur' }
         ]
       }
     }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst.js b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst.js
index ca2e96e9..873e19ac 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst.js
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst.js
@@ -72,14 +72,6 @@ export function submitMain(data) {
   })
 }
 
-export function confirmMaintain(data) {
-  return request({
-    url: 'api/devicemaintenancemst/confirmMaintain',
-    method: 'post',
-    data
-  })
-}
-
 export function auditMaintain(data) {
   return request({
     url: 'api/devicemaintenancemst/auditMaintain',
@@ -88,4 +80,4 @@ export function auditMaintain(data) {
   })
 }
 
-export default { findByCode, add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, confirmMaintain, auditMaintain }
+export default { findByCode, add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, auditMaintain }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
index 4467cf76..cc4e27c7 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
@@ -96,35 +96,23 @@
         >
           提交
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="createExcel"
-        >
-          生成保养单
-        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
+        <el-table-column type="selection" min-width="35" />
+        <el-table-column prop="maint_code" label="保养单号" min-width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column fixed="left" prop="device_code" label="设备编码"  min-width="85" />
-        <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150" />
-        <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="dept_name" label="归属部门"  min-width="130" />
-        <el-table-column fixed="left" prop="use_name" label="使用班组"  min-width="130" />
-        <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
-        <el-table-column fixed="left" prop="invstatus" label="单据状态"  :formatter="formatInvsName" min-width="70" />
-        <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70"  />
-        <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
+        <el-table-column prop="device_code" label="设备编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="归属部门" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="use_name" label="使用部门" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="90" />
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="90"  />
+        <el-table-column prop="plan_start_date" label="计划保养日期" min-width="125" show-overflow-tooltip />
         <el-table-column prop="input_optname" label="创建人" min-width="90" />
         <el-table-column prop="input_time" label="创建时间" min-width="140" />
         <el-table-column prop="update_optname" label="保养人" min-width="90" />
@@ -264,15 +252,6 @@ export default {
           return obj
         })
       })
-    },
-    createExcel() {
-      const _selectData = this.$refs.table.selection
-      const data = _selectData[0]
-      download('api/devicemaintenancemst/createExcel', { 'maint_id': data.maint_id }).then(result => {
-        const name = data.maint_code + '保养工单'
-        this.crud.toQuery()
-        downloadFile(result, name, 'xlsx')
-      })
     }
   }
 }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceaudit/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceaudit/index.vue
index 7bce1800..da21f7e9 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceaudit/index.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceaudit/index.vue
@@ -99,14 +99,14 @@
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100"  />
-        <el-table-column fixed="left" prop="device_code" label="设备编码"  min-width="85" />
-        <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150" />
-        <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="invstatus" label="单据状态"  :formatter="formatInvsName" min-width="70" />
-        <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
-        <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
+        <el-table-column type="selection" min-width="35" />
+        <el-table-column prop="maint_code" label="保养单号" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="90" />
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="90" />
+        <el-table-column prop="plan_start_date" label="计划保养日期" min-width="140" />
         <el-table-column prop="input_optname" label="创建人" min-width="90" />
         <el-table-column prop="input_time" label="创建时间" min-width="140" />
         <el-table-column prop="update_optname" label="保养人" min-width="90" />
@@ -222,8 +222,8 @@ export default {
     auditMaintain() {
       const _selectData = this.$refs.table.selection
       const data = _selectData[0]
-      if (data.invstatus !== '05') {
-        return this.crud.notify('只能对确认状态的单据审核', CRUD.NOTIFICATION_TYPE.INFO)
+      if (data.invstatus !== '04') {
+        return this.crud.notify('只能对结束状态的单据审核', CRUD.NOTIFICATION_TYPE.INFO)
       }
       crudDevicemaintenancemst.auditMaintain(data).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog.vue
deleted file mode 100644
index 650249f4..00000000
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <el-dialog
-    :title="crud.status.title"
-    append-to-body
-    fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
-  >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="单据号" prop="maint_code">
-            <el-input v-model.trim="form.maint_code" style="width: 200px;" disabled placeholder="系统自动生成" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="6">
-          <el-form-item label="业务日期" prop="plan_start_date">
-            <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="6">
-          <el-form-item label="保养类型" prop="maintenancecycle">
-            <el-select
-              v-model="form.maintenancecycle"
-              disabled
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="设备" prop="devicerecord_id">
-            <el-input v-model.trim="form.device_code" :disabled="true" style="width: 200px;">
-              <el-button slot="append" icon="el-icon-plus" :disabled="crud.status.view > 0" @click="putDevice" />
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="保养对象" prop="maint_object">
-            <el-select
-              v-model="form.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in objectList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <div class="crud-opts2">
-      <span class="role-span">项目明细</span>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="crud.status.view > 0"
-          @click="putItem"
-        >
-          添加项目
-        </el-button>
-      </span>
-    </div>
-
-    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
-      <!--表格渲染-->
-      <el-table
-        ref="table2"
-        :data="form.tableData"
-        style="width: 100%;"
-        max-height="500"
-        border
-        :highlight-current-row="true"
-        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      >
-        <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column show-overflow-tooltip prop="maint_item_code" label="保养项目编号" align="center" />
-        <el-table-column show-overflow-tooltip prop="maint_item_name" label="保养项目名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="item_level" label="保养等级" align="center" :formatter="formatLevel" />
-        <el-table-column show-overflow-tooltip prop="contents" label="保养内容" align="center" />
-        <el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
-        <el-table-column prop="dtl_remark" label="备注" align="center">
-          <template slot-scope="scope">
-            <el-input v-show="!scope.row.edit" v-model="scope.row.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select" />
-          </template>
-        </el-table-column>
-
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" :disabled="crud.status.view > 0" @click.native.prevent="delRow(scope.$index, form.tableData)" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2" />
-    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1" />
-  </el-dialog>
-</template>
-
-<script>
-
-const defaultForm = {
-  maint_code: null,
-  maint_object: null,
-  devicerecord_id: null,
-  maintenancecycle: '02',
-  plan_start_date: null,
-  material_type_id: null,
-  device_code: null,
-  tableData: []
-}
-
-import crudDevicemaintenancemst from '@/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst'
-import DeviceDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog'
-import ItemDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog'
-import CRUD, { form, crud } from '@crud/crud'
-
-export default {
-  name: 'AddDialog',
-  dicts: ['EM_DEVICE_BY_INVTYPE'],
-  components: { ItemDialog, DeviceDialog },
-  mixins: [form(defaultForm), crud()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    openParam: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      deviceDialog: false,
-      itemDialog: false,
-      objectList: [
-        { 'label': '班组', 'value': '01' }
-      ],
-      rules: {
-        plan_start_date: [
-          { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
-        ],
-        maintenancecycle: [
-          { required: true, message: '保养周期不能为空', trigger: 'blur' }
-        ],
-        devicerecord_id: [
-          { required: true, message: '设备不能为空', trigger: 'blur' }
-        ],
-        maint_object: [
-          { required: true, message: '保养对象不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    [CRUD.HOOK.beforeSubmit]() {
-      const arr = this.form.tableData
-      if (arr.length === 0) {
-        this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-    },
-    [CRUD.HOOK.afterToEdit]() {
-      const data = {
-        'maint_id': this.form.maint_id
-      }
-      this.form.device_code = this.form.device_name + '-' + this.form.device_code
-      crudDevicemaintenancemst.getDtl(data).then(res => {
-        this.form.tableData = res
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      const data = {
-        'maint_id': this.form.maint_id
-      }
-      crudDevicemaintenancemst.getDtl(data).then(res => {
-        this.form.tableData = res
-      })
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    close() {
-      this.$emit('update:dialogShow', false)
-    },
-    formatLevel(row, cloum) {
-      if (row.item_level === '01') {
-        return '日常'
-      } else if (row.item_level === '02') {
-        return '一级'
-      } else if (row.item_level === '03') {
-        return '二级'
-      }
-    },
-    putDevice() {
-      this.deviceDialog = true
-    },
-    putItem() {
-      this.openParam = this.form
-      this.itemDialog = true
-    },
-    tableChanged1(row) {
-      const arr = row
-      const data = this.form.tableData
-      arr.forEach((item) => {
-        if (this.form.tableData.length !== 0) {
-          this.fla = false
-          for (let i = 0; i < data.length; i++) {
-            if (data[i].maint_item_id === item.maint_item_id) {
-              this.fla = true
-            }
-          }
-          if (this.fla === false) {
-            this.form.tableData.push(item)
-          }
-        } else {
-          this.form.tableData.push(item)
-        }
-      })
-    },
-    tableChanged2(row) {
-      this.form.devicerecord_id = row.devicerecord_id
-      this.form.material_type_id = row.material_type_id
-      this.form.device_code = row.device_name + '-' + row.device_code
-    },
-    delRow(index, rows) {
-      rows.splice(index, 1)
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .el-dialog__title2 {
-  line-height: 24px;
-  font-size:20px;
-  color:#303133;
-}
-
-.crud-opts2 .role-span {
-  padding: 10px 0px 10px 0px;
-}
-.crud-opts2 .crud-opts-form {
-  padding: 10px 0px 0px 20px;
-}
-
-.input-with-select  {
-  background-color: #fff;
-}
-</style>
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/index.vue
deleted file mode 100644
index c41ba964..00000000
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/index.vue
+++ /dev/null
@@ -1,458 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="110px"
-          label-suffix=":"
-        >
-          <el-form-item label="设备类别">
-            <treeselect
-              v-model="query.material_type_id"
-              :load-options="loadClass"
-              :options="classes"
-              style="width: 200px;"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="设备">
-            <el-input
-              v-model="query.device_code"
-              clearable
-              size="mini"
-              placeholder="请输入设备编码、名称"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="使用班组">
-            <treeselect
-              v-model="query.dept_id"
-              :load-options="loadDepts"
-              :options="depts"
-              style="width: 200px;"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="保养类型">
-            <el-select
-              v-model="query.maintenancecycle"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="单据编码">
-            <el-input
-              v-model="query.maint_code"
-              clearable
-              size="mini"
-              placeholder="请输入单据编码、名称"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="hand"
-            />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.invstatus"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_BY_INVSTATUS"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="putIn"
-        >
-          提交
-        </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="crud.selections.length !== 1"
-          @click="createExcel"
-        >
-          生成保养单
-        </el-button>
-      </crudOperation>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
-          <template slot-scope="scope">
-            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column fixed="left" prop="device_code" label="设备编码"  min-width="85" />
-        <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150" />
-        <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="dept_name" label="归属部门"  min-width="130" />
-        <el-table-column fixed="left" prop="use_name" label="使用班组"  min-width="130" />
-        <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
-        <el-table-column fixed="left" prop="invstatus" label="单据状态"  :formatter="formatInvsName" min-width="70" />
-        <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70"  />
-        <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
-        <el-table-column prop="input_optname" label="创建人" min-width="90" />
-        <el-table-column prop="input_time" label="创建时间" min-width="140" />
-        <el-table-column prop="update_optname" label="保养人" min-width="90" />
-        <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
-        <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
-        <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
-        <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
-        <el-table-column prop="audit_optname" label="审核人" min-width="90" />
-        <el-table-column prop="audit_time" label="审核时间" min-width="140" />
-        <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :disabled-edit="scope.row.invstatus !== '01'"
-              :disabled-dle="scope.row.invstatus !== '01'"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <AddDialog />
-  </div>
-</template>
-
-<script>
-import crudDevicemaintenancemst from '@/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst'
-import CRUD, { presenter, header, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
-import DateRangePicker from '@/components/DateRangePicker'
-import AddDialog from '@/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog'
-import { download } from '@/api/data'
-import { downloadFile } from '@/utils'
-import { mapGetters } from 'vuex'
-// import { getDepts, getDeptSuperior } from '@/api/system/dept'
-
-export default {
-  name: 'Devicemaintenancegrid',
-  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
-  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
-  mixins: [presenter(), header(), crud()],
-  cruds() {
-    return CRUD({
-      title: '班组保养维护',
-      url: 'api/devicemaintenancemst/query4',
-      idField: 'maint_id',
-      sort: 'maint_id,desc',
-      crudMethod: { ...crudDevicemaintenancemst },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      classes: [],
-      depts: [],
-      class_idStr: null,
-      materOpt_code: '23',
-      permission: {
-      }
-    }
-  },
-  computed: {
-    ...mapGetters({
-      user: 'user'
-    })
-  },
-  created() {
-    const param = {
-      'materOpt_code': this.materOpt_code
-    }
-    crudMaterialbase.getMaterOptType(param).then(res => {
-      this.class_idStr = res.class_idStr
-      this.crud.query.class_idStr = this.class_idStr
-      this.crud.toQuery()
-      this.queryClassId()
-    })
-    this.getDepts()
-    this.query.dept_id = this.user.dept.id
-    this.getSupDepts(this.user.dept.id)
-    this.crud.toQuery()
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    hand(value) {
-      this.crud.toQuery()
-    },
-    formatMainObject(row, cloum) {
-      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
-    },
-    formatInvsName(row, cloum) {
-      return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
-    },
-    formatMainName(row, cloum) {
-      return this.dict.label.EM_DEVICE_BY_INVTYPE[row.maintenancecycle]
-    },
-    putIn() {
-      const _selectData = this.$refs.table.selection
-      const data = _selectData[0]
-      if (data.invstatus !== '01') {
-        return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
-      }
-      crudDevicemaintenancemst.putIn(data).then(res => {
-        this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
-    },
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    createExcel() {
-      const _selectData = this.$refs.table.selection
-      const data = _selectData[0]
-      download('api/devicemaintenancemst/createExcel', { 'maint_id': data.maint_id }).then(result => {
-        const name = data.maint_code + '保养工单'
-        this.crud.toQuery()
-        downloadFile(result, name, 'xlsx')
-      })
-    },
-    // 获取弹窗内部门数据
-    loadDepts({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 200)
-        })
-      }
-    },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    getSupDepts(deptId) {
-      debugger
-      var number = parseFloat(deptId)
-      getDeptSuperior(number).then(res => {
-        const date = res.content
-        this.buildDepts(date)
-        this.depts = date
-      })
-    },
-    buildDepts(depts) {
-      depts.forEach(data => {
-        if (data.children) {
-          this.buildDepts(data.children)
-        }
-        if (data.hasChildren && !data.children) {
-          data.children = null
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep {
-
-.vue-treeselect__menu {
-
-  overflow-x: auto !important;
-
-  width: 300px;
-
-  max-height: 300px !important;
-
-}
-
-.vue-treeselect__label {
-
-  overflow: unset;
-
-  text-overflow: unset;
-
-}
-
-.vue-treeselect__control {
-
-  height: 20px !important;
-
-}
-
-.vue-treeselect__multi-value-item-container,
-
-.vue-treeselect--has-value .vue-treeselect__multi-value {
-
-  height: 30px;
-
-  line-height: 24px;
-
-  padding: 0;
-
-}
-
-.vue-treeselect__limit-tip,
-
-.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
-
-.vue-treeselect__input-container {
-
-  padding-top: 0;
-
-}
-
-.vue-treeselect--has-value .vue-treeselect__multi-value {
-
-// margin-bottom: 15px;
-
-}
-
-.vue-treeselect__placeholder,
-
-.vue-treeselect__single-value {
-
-  height: 28px;
-
-  line-height: 32px;
-
-  font-size: small;
-
-  color: "#CCCFD6";
-
-
-}
-
-.vue-treeselect--has-value .vue-treeselect__input {
-
-  height: 18px !important;
-
-  line-height: 18px !important;
-
-}
-
-.vue-treeselect div,
-
-.vue-treeselect span {
-
-  box-sizing: content-box;
-
-}
-
-// 选中后的溢出隐藏
-
-   .vue-treeselect__multi-value-label {
-
-     display: block;
-
-     width: 140px;
-
-     overflow: hidden;
-
-     white-space: nowrap;
-
-     text-overflow: ellipsis;
-
-   }
-
-.vue-treeselect__value-container {
-
-  display: block;
-
-  height: 32px;
-
-}
-
-}
-</style>
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue
index d7cc72d8..d28b2506 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue
@@ -80,22 +80,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="保养对象">
-            <el-select
-              v-model="query.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -112,17 +96,6 @@
         >
           开始保养
         </el-button>
- <!--       <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="execu_flag"
-          @click="executeMaintain"
-        >
-          保养执行
-        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"
@@ -134,34 +107,22 @@
         >
           结束保养
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="confirm_flag"
-          @click="confirmMaintain"
-        >
-          保养验收
-        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
-        <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100"  />
-        <el-table-column fixed="left" prop="device_code" label="设备编码"   min-width="85" />
-        <el-table-column fixed="left" prop="device_name" label="设备名称"   min-width="150" />
-        <el-table-column fixed="left" prop="dept_name" label="所属部门"   min-width="130" />
-        <el-table-column fixed="left" prop="use_name" label="使用班组"   min-width="130" />
-        <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="maint_object" label="保养对象"  :formatter="formatMainObject"  min-width="70" />
-        <el-table-column fixed="left" prop="invstatus" label="单据状态"  :formatter="formatInvsName"  min-width="70" />
-        <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName"  min-width="70" />
-        <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
-        <el-table-column prop="input_optname" label="创建人"  min-width="90" />
+        <el-table-column type="selection" min-width="35" />
+        <el-table-column prop="maint_code" label="保养单号" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" min-width="90" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="所属部门" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="use_name" label="使用部门" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName"  min-width="90" />
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName"  min-width="90" />
+        <el-table-column prop="plan_start_date" label="计划保养日期" min-width="140" />
+        <el-table-column prop="input_optname" label="创建人" min-width="90" />
         <el-table-column prop="input_time" label="创建时间" min-width="140" />
-        <el-table-column prop="update_optname" label="保养人"  min-width="90" />
+        <el-table-column prop="update_optname" label="保养人" min-width="90" />
         <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
         <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
         <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
@@ -194,7 +155,7 @@ import StartDialog from '@/views/wms/device_manage/upkeep/devicemaintenancepa/St
 
 export default {
   name: 'Devicemaintenancepa',
-  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
+  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
   components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -248,9 +209,6 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
-    formatMainObject(row, cloum) {
-      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
-    },
     formatInvsName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
     },
@@ -307,35 +265,6 @@ export default {
         }
         this.executeDialog = true
       })
-      // crudDevicemaintenancemst.endMaintain(data).then(res => {
-      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      //   this.crud.toQuery()
-      // })
-    },
-    executeMaintain() {
-      const _selectData = this.$refs.table.selection
-      const data = _selectData[0]
-      if (data.invstatus !== '03') {
-        return this.crud.notify('只能对开始状态的单据执行', CRUD.NOTIFICATION_TYPE.INFO)
-      }
-      crudDevicemaintenancemst.getDtl(data).then(res => {
-        this.openParam = {
-          'form': data,
-          'tableData': res
-        }
-        this.executeDialog = true
-      })
-    },
-    confirmMaintain() {
-      const _selectData = this.$refs.table.selection
-      const data = _selectData[0]
-      if (data.invstatus !== '04') {
-        return this.crud.notify('只能对结束状态的单据确认', CRUD.NOTIFICATION_TYPE.INFO)
-      }
-      crudDevicemaintenancemst.confirmMaintain(data).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
     },
     mySelectionChange(rows) {
       this.buttonChange(rows)
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/AddDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/AddDialog.vue
index 676e5e83..cf79b253 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/AddDialog.vue
@@ -66,21 +66,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="保养对象" prop="maint_object">
-            <el-select
-              v-model="form.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注" prop="remark">
@@ -176,7 +161,7 @@ import CRUD, { form, crud } from '@crud/crud'
 
 export default {
   name: 'AddDialog',
-  dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
+  dicts: ['EM_DEVICE_BY_CYCLE'],
   components: { ItemDialog, DeviceDialog },
   mixins: [form(defaultForm), crud()],
   props: {
@@ -205,9 +190,6 @@ export default {
         ],
         devicerecord_id: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
-        ],
-        maint_object: [
-          { required: true, message: '保养对象不能为空', trigger: 'blur' }
         ]
       }
     }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/CopyAddDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/CopyAddDialog.vue
index 794b5835..6936a555 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/CopyAddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/CopyAddDialog.vue
@@ -69,21 +69,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="保养对象" prop="maint_object">
-            <el-select
-              v-model="form1.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注" prop="remark">
@@ -155,7 +140,7 @@ import CRUD, { crud } from '@crud/crud'
 
 export default {
   name: 'CopyAddDialog',
-  dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
+  dicts: ['EM_DEVICE_BY_CYCLE'],
   components: { ItemDialog, DeviceDialog },
   mixins: [crud()],
   props: {
@@ -263,9 +248,6 @@ export default {
       if (data.plan_start_date === null) {
         return this.crud.notify('计划开始日期不能为空', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      if (data.maint_object === '') {
-        return this.crud.notify('保养对象不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-      }
       if (data.tableData.length === 0) {
         return this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
       }
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog.vue
index 12e3e1c2..ef95990e 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog.vue
@@ -28,15 +28,17 @@
         <treeselect
           v-model="query.dept_id"
           :load-options="loadDepts"
+          :normalizer="normalizer"
           :options="depts"
           style="width: 200px;"
           placeholder="请选择"
         />
       </el-form-item>
-      <el-form-item label="使用班组">
+      <el-form-item label="使用部门">
         <treeselect
           v-model="query.use_id"
           :load-options="loadDepts"
+          :normalizer="normalizer"
           :options="depts"
           style="width: 200px;"
           placeholder="请选择"
@@ -70,7 +72,7 @@
       <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
       <el-table-column prop="class_name" label="设备类型" show-overflow-tooltip />
       <el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
-      <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+      <el-table-column prop="use_name" label="使用部门" show-overflow-tooltip />
       <el-table-column prop="device_spec" label="规格" min-width="130" show-overflow-tooltip />
       <el-table-column prop="device_model" label="型号" show-overflow-tooltip />
       <el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip />
@@ -96,8 +98,8 @@ import pagination from '@crud/Pagination'
 import crudDevicemaintenanceplanmst from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/devicemaintenanceplanmst'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-// import { getDepts, getDeptSuperior } from '@/api/system/dept'
 import { mapGetters } from 'vuex'
+import crudDept from '@/views/system/dept/dept'
 
 export default {
   name: 'Device',
@@ -169,7 +171,7 @@ export default {
       this.$refs.table.clearSelection()
     },
     open() {
-      this.getDepts()
+      this.deptTree()
       this.query.use_id = this.user.dept.id
       this.getSupDepts(this.user.dept.id)
       this.crud.toQuery()
@@ -197,37 +199,30 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+        crudDept.getDeptvo({ is_used: true, pid: parentNode.dept_id }).then(res => {
           parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
+            obj.children = null
             return obj
           })
           setTimeout(() => {
             callback()
-          }, 200)
+          }, 100)
         })
       }
     },
-    getDepts() {
-      getDepts({ enabled: true }).then(res => {
-        this.depts = res.content.map(function(obj) {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
+    deptTree() {
+      setTimeout(() => {
+        crudDept.getDeptTree().then(res => {
+          this.depts = res.content
         })
-      })
+      }, 100)
     },
-    getSupDepts(deptId) {
-      debugger
-      var number = parseFloat(deptId)
-      getDeptSuperior(number).then(res => {
-        const date = res.content
-        this.buildDepts(date)
-        this.depts = date
-      })
+    normalizer(node) {
+      return {
+        id: node.dept_id,
+        label: node.name,
+        children: node.children
+      }
     },
     buildDepts(depts) {
       depts.forEach(data => {
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/index.vue
index 3dd9d7b2..04cf5e12 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/index.vue
@@ -80,22 +80,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="保养对象">
-            <el-select
-              v-model="query.maint_object"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -115,8 +99,8 @@
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="is_active" label="是否启用" min-width="75">
+        <el-table-column type="selection" min-width="35" />
+        <el-table-column fixed prop="is_active" label="是否启用" min-width="75">
           <template slot-scope="scope">
             <el-switch
               :value="format_is_active(scope.row.is_active)"
@@ -126,14 +110,14 @@
             />
           </template>
         </el-table-column>
-        <el-table-column fixed="left" prop="maint_plan_code" label="保养计划单号" min-width="115"  />
-        <el-table-column fixed="left" prop="maint_plan_name" label="保养计划名称" min-width="130"  />
-        <el-table-column fixed="left" prop="class_name" label="设备类型" min-width="130"  />
-        <el-table-column fixed="left" prop="device_code" label="设备编码"  min-width="85"  />
-        <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150"  />
-        <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="75"  />
-        <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="75"  />
+        <el-table-column prop="maint_plan_code" label="保养计划单号" min-width="130" show-overflow-tooltip />
+        <el-table-column prop="maint_plan_name" label="保养计划名称" min-width="130"  />
+        <el-table-column prop="class_name" label="设备类型" min-width="130"  />
+        <el-table-column prop="device_code" label="设备编码" min-width="85"  />
+        <el-table-column prop="device_name" label="设备名称" min-width="150"  />
+        <el-table-column prop="extend_code" label="设备自编码" min-width="100"  />
+        <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="75"  />
+        <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="75"  />
         <el-table-column prop="detail_count" label="明细数" min-width="60"  />
         <el-table-column prop="plan_start_date" label="计划初始日期" min-width="100" />
         <el-table-column prop="real_start_date" label="最近保养开始日期" min-width="125" />
@@ -178,7 +162,7 @@ import CopyAddDialog from '@/views/wms/device_manage/upkeep/devicemaintenancepla
 
 export default {
   name: 'Devicemaintenanceplan',
-  dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
+  dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE'],
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, CopyAddDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -253,9 +237,6 @@ export default {
     formatMainName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_CYCLE[row.maintenancecycle]
     },
-    formatMainObject(row, cloum) {
-      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
-    },
     copyAdd() {
       const _selectData = this.$refs.table.selection
       const data = {