Browse Source

ly PSSR 批量

ly 6 months ago
parent
commit
a47e650ffa
52 changed files with 1977 additions and 144 deletions
  1. 1 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java
  2. 12 9
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMocMapper.java
  3. 21 23
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java
  4. 4 0
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java
  5. 22 18
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java
  6. 4 0
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java
  7. 25 21
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java
  8. 23 23
      master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java
  9. 1 1
      master/src/main/resources/application.yml
  10. 43 0
      ui/src/views/pssr/airtight/index.vue
  11. 43 0
      ui/src/views/pssr/analyzer/index.vue
  12. 43 0
      ui/src/views/pssr/approve/index.vue
  13. 44 1
      ui/src/views/pssr/blind/index.vue
  14. 43 0
      ui/src/views/pssr/circuit/index.vue
  15. 44 1
      ui/src/views/pssr/cleaning/index.vue
  16. 43 0
      ui/src/views/pssr/file/index.vue
  17. 44 1
      ui/src/views/pssr/frame/index.vue
  18. 55 0
      ui/src/views/pssr/franklinism/index.vue
  19. 55 0
      ui/src/views/pssr/gasdetector/index.vue
  20. 55 0
      ui/src/views/pssr/hygiene/index.vue
  21. 55 0
      ui/src/views/pssr/instrumentCalibration/index.vue
  22. 55 0
      ui/src/views/pssr/laboratory/index.vue
  23. 55 0
      ui/src/views/pssr/lighting/index.vue
  24. 43 2
      ui/src/views/pssr/lock/index.vue
  25. 1 1
      ui/src/views/pssr/material/index.vue
  26. 1 1
      ui/src/views/pssr/materialRaw/index.vue
  27. 45 2
      ui/src/views/pssr/measure/index.vue
  28. 45 2
      ui/src/views/pssr/moc/index.vue
  29. 55 0
      ui/src/views/pssr/motor/index.vue
  30. 45 2
      ui/src/views/pssr/nitrogen/index.vue
  31. 35 2
      ui/src/views/pssr/overhaulExchanger/index.vue
  32. 36 2
      ui/src/views/pssr/overhaulFilter/index.vue
  33. 36 2
      ui/src/views/pssr/overhaulPipe/index.vue
  34. 36 2
      ui/src/views/pssr/overhaulPump/index.vue
  35. 36 2
      ui/src/views/pssr/overhaulTower/index.vue
  36. 35 2
      ui/src/views/pssr/overhaulValve/index.vue
  37. 35 1
      ui/src/views/pssr/patrol/index.vue
  38. 55 0
      ui/src/views/pssr/power/index.vue
  39. 45 2
      ui/src/views/pssr/programme/index.vue
  40. 45 2
      ui/src/views/pssr/protection/index.vue
  41. 44 1
      ui/src/views/pssr/pssrModel/index.vue
  42. 55 0
      ui/src/views/pssr/public/index.vue
  43. 45 2
      ui/src/views/pssr/pumpCleaning/index.vue
  44. 45 2
      ui/src/views/pssr/pumpFill/index.vue
  45. 45 2
      ui/src/views/pssr/pumpOverhaul/index.vue
  46. 45 2
      ui/src/views/pssr/safetyBleed/index.vue
  47. 45 2
      ui/src/views/pssr/safetyBreath/index.vue
  48. 45 2
      ui/src/views/pssr/safetyBrust/index.vue
  49. 45 2
      ui/src/views/pssr/safetyFlamearrester/index.vue
  50. 45 2
      ui/src/views/pssr/safetyValve/index.vue
  51. 55 0
      ui/src/views/pssr/torchvoc/index.vue
  52. 44 1
      ui/src/views/pssr/vessel/index.vue

+ 1 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -252,7 +252,7 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrMoc tPssrMoc) {
-        return toAjax(tPssrMocMapper.updateTPssrMoc(tPssrMoc));
+        return toAjax(tPssrMocMapper.updateTPssrMocByIds(tPssrMoc));
     }
 
     /**

+ 12 - 9
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMocMapper.java

@@ -1,20 +1,21 @@
 package com.ruoyi.project.pssr.mapper;
 
-import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.pssr.domain.TPssrMoc;
 
+import java.util.List;
+
 /**
  * MOC完成确认清单Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-10-31
  */
-public interface TPssrMocMapper 
+public interface TPssrMocMapper
 {
     /**
      * 查询MOC完成确认清单
-     * 
+     *
      * @param id MOC完成确认清单ID
      * @return MOC完成确认清单
      */
@@ -22,7 +23,7 @@ public interface TPssrMocMapper
 
     /**
      * 查询MOC完成确认清单列表
-     * 
+     *
      * @param tPssrMoc MOC完成确认清单
      * @return MOC完成确认清单集合
      */
@@ -31,7 +32,7 @@ public interface TPssrMocMapper
 
     /**
      * 新增MOC完成确认清单
-     * 
+     *
      * @param tPssrMoc MOC完成确认清单
      * @return 结果
      */
@@ -39,15 +40,17 @@ public interface TPssrMocMapper
 
     /**
      * 修改MOC完成确认清单
-     * 
+     *
      * @param tPssrMoc MOC完成确认清单
      * @return 结果
      */
     public int updateTPssrMoc(TPssrMoc tPssrMoc);
+    public int updateTPssrMocByIds(TPssrMoc tPssrMoc);
+
 
     /**
      * 删除MOC完成确认清单
-     * 
+     *
      * @param id MOC完成确认清单ID
      * @return 结果
      */
@@ -55,7 +58,7 @@ public interface TPssrMocMapper
 
     /**
      * 批量删除MOC完成确认清单
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 21 - 23
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -1,31 +1,28 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.common.utils.job.ScheduleUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.sems.domain.ParamData;
+import com.ruoyi.project.sems.domain.TSpecCheck;
+import com.ruoyi.project.sems.domain.TSpecdevCc;
 import com.ruoyi.project.sems.his.controller.TApproveSpecModifyController;
 import com.ruoyi.project.sems.his.controller.TSpechiCcController;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
 import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
+import com.ruoyi.project.sems.service.ITSpecdevCcService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysPlant;
@@ -38,23 +35,20 @@ import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.quartz.SchedulerException;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITSpecdevCcService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 特种设备叉车台账Controller
@@ -333,6 +327,10 @@ public class TSpecdevCcController extends BaseController {
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             } catch (Exception e) {
                 failNumber++;

+ 4 - 0
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -332,6 +332,10 @@ public class TSpecdevDtController extends BaseController {
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             } catch (Exception e) {
                 failNumber++;

+ 22 - 18
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -1,29 +1,29 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.sems.domain.*;
-
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.sems.domain.ParamData;
+import com.ruoyi.project.sems.domain.TSpecCheck;
+import com.ruoyi.project.sems.domain.TSpecdevDzsb;
 import com.ruoyi.project.sems.his.controller.TApproveSpecModifyController;
 import com.ruoyi.project.sems.his.controller.TSpechiDzsbController;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
 import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
 import com.ruoyi.project.sems.mapper.TSpecdevDzsbMapper;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
+import com.ruoyi.project.sems.service.ITSpecdevDzsbService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysPlant;
@@ -38,19 +38,19 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITSpecdevDzsbService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 特种设备吊装设备台账Controller
@@ -342,6 +342,10 @@ public class TSpecdevDzsbController extends BaseController {
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + JSON.toJSONString(entity));
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             } catch (Exception e) {
                 failNumber++;

+ 4 - 0
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -362,6 +362,10 @@ public class TSpecdevGlController extends BaseController
                 }
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             }catch (Exception e){
                 failNumber++;

+ 25 - 21
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -1,33 +1,30 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.project.sems.domain.*;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.sems.domain.ParamData;
+import com.ruoyi.project.sems.domain.TSpecCheck;
+import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.his.controller.TApproveSpecModifyController;
-import com.ruoyi.project.sems.his.controller.TSpechiGlController;
 import com.ruoyi.project.sems.his.controller.TSpechiYlgdController;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
 import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
 import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
+import com.ruoyi.project.sems.service.ITSpecdevYlgdService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysPlant;
@@ -42,19 +39,22 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.service.ITSpecdevYlgdService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 特种设备压力管道台账Controller
@@ -402,6 +402,10 @@ public class TSpecdevYlgdController extends BaseController {
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             } catch (Exception e) {
                 failNumber.getAndIncrement();

+ 23 - 23
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -1,36 +1,30 @@
 package com.ruoyi.project.sems.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.sems.domain.ParamData;
 import com.ruoyi.project.sems.domain.TSpecCheck;
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.his.controller.TApproveSpecModifyController;
-import com.ruoyi.project.sems.his.controller.TSpechiYlgdController;
 import com.ruoyi.project.sems.his.controller.TSpechiYlrqController;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
 import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
-import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
 import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
+import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysPlant;
@@ -45,20 +39,22 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.domain.TSpecdevYlrq;
-import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 特种设备压力容器台账Controller
@@ -408,6 +404,10 @@ public class TSpecdevYlrqController extends BaseController {
                 }
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
+                if(entity.getPlantCode() == null) {
+                    //未发现plant
+                    throw new Exception("plant为空");
+                }
                 list.add(entity);
             } catch (Exception e) {
                 failNumber++;

+ 1 - 1
master/src/main/resources/application.yml

@@ -6,7 +6,7 @@ ruoyi:
   version: 3.2.0
   # 版权年份
   copyrightYear: 2020
-  # 实例演示开关
+  # polarDb开关
   demoEnabled: false
   isPolar: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /u03/cpmsfile/uploadPath)

+ 43 - 0
ui/src/views/pssr/airtight/index.vue

@@ -276,6 +276,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 43 - 0
ui/src/views/pssr/analyzer/index.vue

@@ -259,6 +259,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 43 - 0
ui/src/views/pssr/approve/index.vue

@@ -273,6 +273,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 44 - 1
ui/src/views/pssr/blind/index.vue

@@ -357,7 +357,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="inConfirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.inConfirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="inConfirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.inConfirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="installDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.installDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 43 - 0
ui/src/views/pssr/circuit/index.vue

@@ -325,6 +325,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 44 - 1
ui/src/views/pssr/cleaning/index.vue

@@ -267,7 +267,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 43 - 0
ui/src/views/pssr/file/index.vue

@@ -275,6 +275,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 44 - 1
ui/src/views/pssr/frame/index.vue

@@ -299,7 +299,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 55 - 0
ui/src/views/pssr/franklinism/index.vue

@@ -38,6 +38,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:franklinism:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -224,6 +236,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 55 - 0
ui/src/views/pssr/gasdetector/index.vue

@@ -38,6 +38,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:gasdetector:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -237,6 +249,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 55 - 0
ui/src/views/pssr/hygiene/index.vue

@@ -47,6 +47,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:hygiene:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -286,6 +298,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 55 - 0
ui/src/views/pssr/instrumentCalibration/index.vue

@@ -47,6 +47,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:instrumentCalibration:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -250,6 +262,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 55 - 0
ui/src/views/pssr/laboratory/index.vue

@@ -64,6 +64,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:laboratory:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -257,6 +269,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 55 - 0
ui/src/views/pssr/lighting/index.vue

@@ -38,6 +38,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:lighting:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -229,6 +241,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 43 - 2
ui/src/views/pssr/lock/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:lock:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -304,7 +304,48 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="检查人" prop="lockeder">
+          <el-select v-model="form.lockeder" clearable filterable style="width: 100%;"
+                     placeholder="请选择检查人">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人" prop="confirm">
+          <el-select v-model="form.confirm" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 1 - 1
ui/src/views/pssr/material/index.vue

@@ -260,7 +260,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
+    <!-- 批量修改对话框 -->
     <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
       <el-form ref="form" :model="form"  label-width="80px">
         <el-form-item>

+ 1 - 1
ui/src/views/pssr/materialRaw/index.vue

@@ -287,7 +287,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
+    <!-- 批量修改对话框 -->
     <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
       <el-form ref="form" :model="form"  label-width="80px">
         <el-form-item>

+ 45 - 2
ui/src/views/pssr/measure/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:measure:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -275,7 +275,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"

+ 45 - 2
ui/src/views/pssr/moc/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:moc:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -287,7 +287,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"

+ 55 - 0
ui/src/views/pssr/motor/index.vue

@@ -47,6 +47,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:motor:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -244,6 +256,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 45 - 2
ui/src/views/pssr/nitrogen/index.vue

@@ -52,7 +52,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:nitrogen:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -263,7 +263,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 35 - 2
ui/src/views/pssr/overhaulExchanger/index.vue

@@ -83,7 +83,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulExchanger:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -270,7 +270,40 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmedPerson"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="completionDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.completionDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 36 - 2
ui/src/views/pssr/overhaulFilter/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulFilter:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -277,7 +277,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人" prop="respPerson"
+                      v-if="isApprove==0">
+          <el-select v-model="form.respPerson" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="时间" prop="completionDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.completionDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 36 - 2
ui/src/views/pssr/overhaulPipe/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulPipe:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -231,7 +231,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 36 - 2
ui/src/views/pssr/overhaulPump/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulPump:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -243,7 +243,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmedPerson"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="时间" prop="completionDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.completionDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 36 - 2
ui/src/views/pssr/overhaulTower/index.vue

@@ -83,7 +83,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulTower:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -270,7 +270,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmedPerson"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="时间" prop="completionDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.completionDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 35 - 2
ui/src/views/pssr/overhaulValve/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:overhaulValve:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -266,7 +266,40 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="identifyingPerson"
+                      v-if="isApprove==0">
+          <el-select v-model="form.identifyingPerson" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="doneDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.doneDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 35 - 1
ui/src/views/pssr/patrol/index.vue

@@ -64,7 +64,41 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1Name"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1Name" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 55 - 0
ui/src/views/pssr/power/index.vue

@@ -38,6 +38,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:power:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -226,6 +238,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 45 - 2
ui/src/views/pssr/programme/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:programme:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -285,7 +285,50 @@
       </div>
     </el-dialog>
 
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/protection/index.vue

@@ -48,7 +48,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:protection:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -236,7 +236,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 44 - 1
ui/src/views/pssr/pssrModel/index.vue

@@ -171,7 +171,50 @@
       </div>
     </el-dialog>
 
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 55 - 0
ui/src/views/pssr/public/index.vue

@@ -152,6 +152,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:public:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -401,6 +413,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 45 - 2
ui/src/views/pssr/pumpCleaning/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:pumpCleaning:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -257,7 +257,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/pumpFill/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:pumpFill:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -265,7 +265,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/pumpOverhaul/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:pumpOverhaul:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -254,7 +254,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/safetyBleed/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:safetyBleed:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -291,7 +291,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/safetyBreath/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:safetyBreath:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -291,7 +291,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/safetyBrust/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:safetyBrust:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -301,7 +301,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -57,7 +57,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:safetyFlamearrester:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -280,7 +280,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 45 - 2
ui/src/views/pssr/safetyValve/index.vue

@@ -66,7 +66,7 @@
           :disabled="multiple"
           @click="handleBatch"
           v-if="isApprove==0"
-          v-hasPermi="['pssr:pipe:edit']"
+          v-hasPermi="['pssr:safetyValve:edit']"
         >批量修改
         </el-button>
       </el-col>
@@ -283,7 +283,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
       <el-upload

+ 55 - 0
ui/src/views/pssr/torchvoc/index.vue

@@ -55,6 +55,18 @@
           v-if="isApprove==0"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBatch"
+          v-if="isApprove==0"
+          v-hasPermi="['pssr:torchvoc:edit']"
+        >批量修改
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -243,6 +255,49 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+    </el-dialog>
+      <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirm1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirm2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
     </el-dialog>
       <!-- 用户导入对话框 -->
       <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

+ 44 - 1
ui/src/views/pssr/vessel/index.vue

@@ -315,7 +315,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 用户导入对话框 -->
+    <!-- 批量修改对话框 -->
+    <el-dialog :close-on-click-modal="false" title="批量修改" :visible.sync="openBatch" width="500px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <span>已选择 {{ ids.length }} 条数据</span>
+        </el-form-item>
+        <el-form-item label="确认人1" prop="confirmer1"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer1" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认人2" prop="confirmer2"
+                      v-if="isApprove==0">
+          <el-select v-model="form.confirmer2" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
+            <el-option v-for="user in userOptions"
+                       :label="user.nickName"
+                       :value="user.userId+''"
+                       :key="user.userId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="confirmationDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormBatch">确 定</el-button>
+        <el-button @click="cancelBatch">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"