pssr 锁开锁关关联破锁台账数据，多选pid直接带出该pid下的所有锁，如果有未结束流程的锁，在发起审批的时候提示哪些锁未完成。

     原辅料改成一个确认人
     支吊架同上还有描述
     特种设备隐藏按钮
     经理审批根据装置查询

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -266,7 +266,7 @@ public class TPssrAirtightController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrAirtight.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrAirtight.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -237,7 +237,7 @@ public class TPssrAnalyzerController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrAnalyzer.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrAnalyzer.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -20,6 +20,7 @@ import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.impl.util.CollectionUtil;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -391,10 +392,12 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("gygc");
             forShorts.add("yfl");
         }
-        subcontent.setForShorts(forShorts);
-        for (TPssrSubcontent tPssrSubcontent : tPssrSubcontentService.selectTPssrSubcontentListByForShort(subcontent)) {
-            if (tPssrSubcontent.getApproveStatus() != 2) {
-                return true;
+        if (CollectionUtils.isNotEmpty(forShorts)) {
+            subcontent.setForShorts(forShorts);
+            for (TPssrSubcontent tPssrSubcontent : tPssrSubcontentService.selectTPssrSubcontentListByForShort(subcontent)) {
+                if (tPssrSubcontent.getApproveStatus() != 2) {
+                    return true;
+                }
             }
         }
         return false;
@@ -2102,22 +2105,15 @@ public class TPssrApproveController extends BaseController {
         entity.setApproveStatus(1L);
         TPssrMaterial tPssrMaterial = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
         String confirmer1s = null;
-        String confirmer2s = null;
         if (tPssrMaterial != null) {
             confirmer1s = tPssrMaterial.getConfirm1();
-            confirmer2s = tPssrMaterial.getConfirm2();
         }
         logger.info("=======================confirmer1s:{}", confirmer1s);
-        logger.info("=======================confirmer2s:{}", confirmer2s);
 
         Set<String> confirmerUsers1 = new HashSet<>();
-        Set<String> confirmerUsers2 = new HashSet<>();
         if (StringUtils.isNotEmpty(confirmer1s)) {
             confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
         }
-        if (StringUtils.isNotEmpty(confirmer2s)) {
-            confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
-        }
         //查询是否已存在审批流程
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(sub.getId());
         if (tPssrApprove == null) {
@@ -2130,24 +2126,20 @@ public class TPssrApproveController extends BaseController {
             approve.setCreatedate(new Date());
             tPssrApproveService.insertTPssrApprove(approve);
 
-            pssr2confirm(approve, new ArrayList<>(confirmerUsers1), new ArrayList<>(confirmerUsers2), sub.getConfirm());
+            pssr1confirm(approve, new ArrayList<>(confirmerUsers1), sub.getConfirm());
         } else {
-            delProcess(tPssrApprove.getProcessId(), "pssr2confirm");
+            delProcess(tPssrApprove.getProcessId(), "pssr1confirm");
             entity.setSubId(sub.getId());
             entity.setApproveStatus(3L);
             tPssrMaterial = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
             if (tPssrMaterial != null) {
                 confirmer1s = tPssrMaterial.getConfirm1();
-                confirmer2s = tPssrMaterial.getConfirm2();
             }
 
             if (StringUtils.isNotEmpty(confirmer1s)) {
                 confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
             }
-            if (StringUtils.isNotEmpty(confirmer2s)) {
-                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
-            }
-            pssr2confirm(tPssrApprove, new ArrayList<>(confirmerUsers1), new ArrayList<>(confirmerUsers2), sub.getConfirm());
+            pssr1confirm(tPssrApprove, new ArrayList<>(confirmerUsers1), sub.getConfirm());
         }
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -236,7 +236,7 @@ public class TPssrCircuitController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrCircuit.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrCircuit.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -236,7 +236,7 @@ public class TPssrCleaningController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrCleaning.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrCleaning.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -236,7 +236,7 @@ public class TPssrFrameController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrFrame.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrFrame.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -237,7 +237,7 @@ public class TPssrFranklinismController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrFranklinism.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrFranklinism.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -237,7 +237,7 @@ public class TPssrGasdetectorController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrGasdetector.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrGasdetector.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -235,7 +235,7 @@ public class TPssrHygieneController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrHygiene.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrHygiene.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -237,7 +237,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrInstrumentCalibration.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrInstrumentCalibration.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -236,7 +236,7 @@ public class TPssrLaboratoryController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrLaboratory.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrLaboratory.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -239,7 +239,7 @@ public class TPssrLightingController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrLighting.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrLighting.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -129,42 +129,27 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmMaterial")
     public AjaxResult confirmMaterial(@RequestBody TPssrMaterial tPssrMaterial) {
-        long queryStatus = 0;
-        long approveStatus = 0;
         Date date = null;
         TPssrMaterial material = new TPssrMaterial();
-        if (tPssrMaterial.getTaskType() == 4) {
-            //确认人1确认
-            queryStatus = 1;
-            approveStatus = 3;
-            material.setConfirm1(getUserId().toString());
-            date = new Date();
-        } else if (tPssrMaterial.getTaskType() == 5) {
-            //确认人2确认
-            queryStatus = 3;
-            approveStatus = 2;
-            material.setConfirm2(getUserId().toString());
-            date = new Date();
-        }
         if (tPssrMaterial.getIds() != null && tPssrMaterial.getIds().length > 0) {
             for (Long id : tPssrMaterial.getIds()) {
                 material = tPssrMaterialService.selectTPssrMaterialById(id);
-                if (material.getConfirmationDate() == null && tPssrMaterial.getTaskType() == 5) {
+                if (material.getConfirmationDate() == null) {
                     material.setConfirmationDate(new Date());
                 }
-                material.setApproveStatus(approveStatus);
+                material.setApproveStatus(2L);
                 material.setUpdatedate(new Date());
                 material.setUpdaterCode(String.valueOf(getUserId()));
                 tPssrMaterialService.updateTPssrMaterial(material);
             }
         } else {
             material.setSubId(tPssrMaterial.getSubId());
-            material.setApproveStatus(queryStatus);
+            material.setApproveStatus(1L);
             for (TPssrMaterial item : tPssrMaterialService.selectTPssrMaterialList(material)) {
                 if (item.getConfirmationDate() == null && tPssrMaterial.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
-                item.setApproveStatus(approveStatus);
+                item.setApproveStatus(2L);
                 item.setUpdatedate(new Date());
                 item.setUpdaterCode(String.valueOf(getUserId()));
                 tPssrMaterialService.updateTPssrMaterial(item);
@@ -173,7 +158,7 @@ public class TPssrMaterialController extends BaseController {
         //查询当前待审批的确认人
         TPssrMaterial entity = new TPssrMaterial();
         entity.setSubId(tPssrMaterial.getSubId());
-        entity.setApproveStatus(queryStatus);
+        entity.setApproveStatus(1L);
         TPssrMaterial Material = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
         if (Material != null) {
             //如果当前用户还有待审批任务
@@ -218,7 +203,7 @@ public class TPssrMaterialController extends BaseController {
             TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterial.getSubId());
 
             try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
                 historyService.deleteHistoricProcessInstance(approve.getProcessId());
             } catch (Exception e) {
                 logger.info("无运行时流程");
@@ -231,22 +216,15 @@ public class TPssrMaterialController extends BaseController {
             entity.setApproveStatus(1L);
             TPssrMaterial PssrMaterial = tPssrMaterialService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;
-            String confirmer2s = null;
             if (PssrMaterial != null) {
                 confirmer1s = PssrMaterial.getConfirm1();
-                confirmer2s = PssrMaterial.getConfirm2();
             }
             logger.info("=======================confirmer1s:{}", confirmer1s);
-            logger.info("=======================confirmer2s:{}", confirmer2s);
 
             Set<String> confirmerUsers1 = new HashSet<>();
-            Set<String> confirmerUsers2 = new HashSet<>();
             if (StringUtils.isNotEmpty(confirmer1s)) {
                 confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
             }
-            if (StringUtils.isNotEmpty(confirmer2s)) {
-                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
-            }
 
             // 开始申请流程
             long businessKey = approve.getApproveId();
@@ -254,11 +232,10 @@ public class TPssrMaterialController extends BaseController {
             Authentication.setAuthenticatedUserId(userId);//设置当前申请人
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
-            variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmUsers", new ArrayList<>(confirmerUsers1));
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
 
             // 修改审批表和sub表
             approve.setProcessId(pi.getProcessInstanceId());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java

@@ -128,42 +128,26 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmMaterialRaw")
     public AjaxResult confirmMaterialRaw(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
-        long queryStatus = 0;
-        long approveStatus = 0;
-        Date date = null;
         TPssrMaterialRaw materialRaw = new TPssrMaterialRaw();
-        if (tPssrMaterialRaw.getTaskType() == 4) {
-            //确认人1确认
-            queryStatus = 1;
-            approveStatus = 3;
-            materialRaw.setConfirm1(getUserId().toString());
-            date = new Date();
-        } else if (tPssrMaterialRaw.getTaskType() == 5) {
-            //确认人2确认
-            queryStatus = 3;
-            approveStatus = 2;
-            materialRaw.setConfirm2(getUserId().toString());
-            date = new Date();
-        }
         if (tPssrMaterialRaw.getIds() != null && tPssrMaterialRaw.getIds().length > 0) {
             for (Long id : tPssrMaterialRaw.getIds()) {
                 materialRaw = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
-                if (materialRaw.getConfirmationDate() == null && tPssrMaterialRaw.getTaskType() == 5) {
+                if (materialRaw.getConfirmationDate() == null) {
                     materialRaw.setConfirmationDate(new Date());
                 }
-                materialRaw.setApproveStatus(approveStatus);
+                materialRaw.setApproveStatus(2L);
                 materialRaw.setUpdatedate(new Date());
                 materialRaw.setUpdaterCode(String.valueOf(getUserId()));
                 tPssrMaterialRawService.updateTPssrMaterialRaw(materialRaw);
             }
         } else {
             materialRaw.setSubId(tPssrMaterialRaw.getSubId());
-            materialRaw.setApproveStatus(queryStatus);
+            materialRaw.setApproveStatus(1L);
             for (TPssrMaterialRaw item : tPssrMaterialRawService.selectTPssrMaterialRawList(materialRaw)) {
-                if (item.getConfirmationDate() == null && tPssrMaterialRaw.getTaskType() == 5) {
+                if (item.getConfirmationDate() == null) {
                     item.setConfirmationDate(new Date());
                 }
-                item.setApproveStatus(approveStatus);
+                item.setApproveStatus(2L);
                 item.setUpdatedate(new Date());
                 item.setUpdaterCode(String.valueOf(getUserId()));
                 tPssrMaterialRawService.updateTPssrMaterialRaw(item);
@@ -172,7 +156,7 @@ public class TPssrMaterialRawController extends BaseController {
         //查询当前待审批的确认人
         TPssrMaterialRaw entity = new TPssrMaterialRaw();
         entity.setSubId(tPssrMaterialRaw.getSubId());
-        entity.setApproveStatus(queryStatus);
+        entity.setApproveStatus(1L);
         TPssrMaterialRaw MaterialRaw = tPssrMaterialRawService.selectAllConfirmedPersonBySubId(entity);
         if (MaterialRaw != null) {
             //如果当前用户还有待审批任务
@@ -217,7 +201,7 @@ public class TPssrMaterialRawController extends BaseController {
             TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterialRaw.getSubId());
 
             try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
                 historyService.deleteHistoricProcessInstance(approve.getProcessId());
             } catch (Exception e) {
                 logger.info("无运行时流程");
@@ -230,22 +214,15 @@ public class TPssrMaterialRawController extends BaseController {
             entity.setApproveStatus(1L);
             TPssrMaterialRaw PssrMaterialRaw = tPssrMaterialRawService.selectAllConfirmedPersonBySubId(entity);
             String confirmer1s = null;
-            String confirmer2s = null;
             if (PssrMaterialRaw != null) {
                 confirmer1s = PssrMaterialRaw.getConfirm1();
-                confirmer2s = PssrMaterialRaw.getConfirm2();
             }
             logger.info("=======================confirmer1s:{}", confirmer1s);
-            logger.info("=======================confirmer2s:{}", confirmer2s);
 
             Set<String> confirmerUsers1 = new HashSet<>();
-            Set<String> confirmerUsers2 = new HashSet<>();
             if (StringUtils.isNotEmpty(confirmer1s)) {
                 confirmerUsers1.addAll(Arrays.asList(confirmer1s.split(",")));
             }
-            if (StringUtils.isNotEmpty(confirmer2s)) {
-                confirmerUsers2.addAll(Arrays.asList(confirmer2s.split(",")));
-            }
 
             // 开始申请流程
             long businessKey = approve.getApproveId();
@@ -253,11 +230,10 @@ public class TPssrMaterialRawController extends BaseController {
             Authentication.setAuthenticatedUserId(userId);//设置当前申请人
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
-            variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmUsers", new ArrayList<>(confirmerUsers1));
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
 
             // 修改审批表和sub表
             approve.setProcessId(pi.getProcessInstanceId());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -235,7 +235,7 @@ public class TPssrMotorController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrMotor.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrMotor.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -236,7 +236,7 @@ public class TPssrPowerController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrPower.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrPower.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -236,7 +236,7 @@ public class TPssrPublicController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrPublic.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrPublic.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSubcontentController.java

@@ -25,7 +25,6 @@ import io.jsonwebtoken.lang.Assert;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -74,6 +73,18 @@ public class TPssrSubcontentController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:subcontent:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrSubcontent tPssrSubcontent) {
+        if (tPssrSubcontent.getTaskType() == 1) {
+            Long userId = getUserId();
+            TPssrAboveall aboveall = tPssrAboveallService.selectTPssrAboveallById(tPssrSubcontent.getAboveallId());
+            if (userId.equals(aboveall.getPlantMgr())) {
+                tPssrSubcontent.setDeptUnit("Plant");
+            } else if (userId.equals(aboveall.getCtmMgr())) {
+                tPssrSubcontent.setDeptUnit("CTM");
+            } else if (userId.equals(aboveall.getCtaMgr())) {
+                tPssrSubcontent.setDeptUnit("CTA");
+            }
+
+        }
         startPage();
         List<TPssrSubcontent> list = tPssrSubcontentService.selectTPssrSubcontentList(tPssrSubcontent);
         return getDataTable(list);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -238,7 +238,7 @@ public class TPssrTorchvocController extends BaseController
             param.put("confirmUsers2", new ArrayList<>(remover));
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除；" + tPssrTorchvoc.getRemarks());
+            taskService.addComment(taskId, approve.getProcessId(), "驳回；" + tPssrTorchvoc.getRemarks());
             taskService.complete(taskId, param);
 
             // 修改审批表和sub表

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSubcontent.java

@@ -116,6 +116,16 @@ public class TPssrSubcontent extends BaseEntity
 
     private List<Long> ids;
 
+    private Long taskType;
+
+    public Long getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Long taskType) {
+        this.taskType = taskType;
+    }
+
     public List<String> getForShorts() {
         return forShorts;
     }

ui/src/views/approve/approveDetail/pssrMgrApprove-detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <subcontent :aboveall-id="Number(aboveallId)" :is-approve="Number(2)" :client-height="Number(350)"/>
+    <subcontent :aboveall-id="Number(aboveallId)" :is-approve="Number(2)" :client-height="Number(350)" :task-type="Number(taskType)"/>
     <div  style="text-align: center">
       <el-button v-if="!this.taskForm.taskId == ''" type="primary"
                  @click="dataFormSubmit(0)">通过</el-button>
@@ -37,6 +37,7 @@ export default {
       //label样式
       labelStyle: {'width': '200px'},
       isApprove: 1,//0-显示新增等按钮；1-确认人查询（我的待办）；2-28项负责人查询（我的待办）；3-无按钮；4-确认人1；5-确认人2；6-确认人3；
+      taskType: 0,//0-查询所有sub数据；1-只查询当前用户对应的输得
       //流转列表
       historyList: [],
       historyLoading: true,
@@ -79,6 +80,10 @@ export default {
         this.taskForm.tPssrApprove = res.rows[0];
         console.log(this.taskForm)
       })
+      console.log(taskName)
+      if (taskName=='所有装置经理'){
+        this.taskType=1
+      }
     },
     getHistorylist() {
       getHistorylist({processId: this.taskForm.processId}).then(response => {

ui/src/views/pssr/blind/index.vue

@@ -123,7 +123,7 @@
           :disabled="multiple"
           @click="handleTurnDown"
           v-hasPermi="['pssr:blind:edit']"
-        >驳回至拆除
+        >驳回
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

ui/src/views/pssr/frame/index.vue

@@ -2,22 +2,22 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <!--<el-form-item label="内容表id" prop="subId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.subId"-->
-          <!--placeholder="请输入内容表id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.subId"-->
+      <!--placeholder="请输入内容表id"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="审批id" prop="approveId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.approveId"-->
-          <!--placeholder="请输入审批id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.approveId"-->
+      <!--placeholder="请输入审批id"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <el-form-item label="所在区域" prop="region">
         <el-input
@@ -57,7 +57,7 @@
       </el-form-item>
       <el-form-item label="支架形式" prop="supportType">
         <el-select v-model="queryParams.supportType" placeholder="请选择支架形式" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="管部" prop="framePipe">
@@ -134,54 +134,54 @@
       </el-form-item>
       <el-form-item label="确认时间" prop="confirmationDate">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择确认时间">
+                        v-model="queryParams.confirmationDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择确认时间">
         </el-date-picker>
       </el-form-item>
       <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.createrCode"-->
+      <!--placeholder="请输入创建人"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
+      <!--<el-date-picker clearable size="small" style="width: 200px"-->
+      <!--v-model="queryParams.createdate"-->
+      <!--type="date"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--placeholder="选择创建时间">-->
+      <!--</el-date-picker>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.updaterCode"-->
+      <!--placeholder="请输入修改人"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
+      <!--<el-date-picker clearable size="small" style="width: 200px"-->
+      <!--v-model="queryParams.updatedate"-->
+      <!--type="date"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--placeholder="选择修改时间">-->
+      <!--</el-date-picker>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.deptId"-->
+      <!--placeholder="请输入部门编号"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <el-form-item label="备注" prop="remarks">
         <el-input
@@ -207,7 +207,8 @@
           @click="handleAdd"
           v-hasPermi="['pssr:frame:add']"
           v-if="isApprove==0"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -218,7 +219,8 @@
           @click="handleUpdate"
           v-hasPermi="['pssr:frame:edit']"
           v-if="isApprove==0"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -229,18 +231,20 @@
           @click="handleDelete"
           v-hasPermi="['pssr:frame:remove']"
           v-if="isApprove==0"
-        >删除</el-button>
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['pssr:frame:edit']"
+          v-if="isApprove==0"
+        >导入
+        </el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:frame:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -249,7 +253,8 @@
           @click="handleExport"
           v-hasPermi="['pssr:frame:export']"
           v-if="isApprove==0"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -285,16 +290,19 @@
         >驳回
         </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>弹簧支（吊）架检查维护记录</H2>
+      <H2>弹簧支（吊）架检查维护记录</H2><br>
+      <span>1.参照检查记录中的检查标准对现场弹簧支吊架各部件进行检查，如没有发现问题和异常请填写“完好”<br>
+2.如发现问题和异常，请填写“问题描述”，并在“处理结果”填写完成时间和处理措施描述。 </span>
     </div>
 
 
-    <el-table v-loading="loading" :data="frameList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="frameList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="内容表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
@@ -306,54 +314,37 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="所在区域" align="center" prop="region" :show-overflow-tooltip="true"/>
-      <el-table-column label="支架编号" align="center" prop="bracketNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="管线号" align="center" prop="pipelineNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="支架形式" align="center" prop="supportType" :show-overflow-tooltip="true"/>
-      <el-table-column label="管部" align="center" prop="framePipe" :show-overflow-tooltip="true"/>
-      <el-table-column label="根部" align="center" prop="frameRoot" :show-overflow-tooltip="true"/>
-      <el-table-column label="功能件" align="center" prop="functionalPart" :show-overflow-tooltip="true"/>
-      <el-table-column label="连接件" align="center" prop="connector" :show-overflow-tooltip="true"/>
-      <el-table-column label="处理结果" align="center" prop="processingResult" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
-                       width="150">
+      <el-table-column label="所在区域" align="center" prop="region" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="支架编号" align="center" prop="bracketNumber" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="管线号" align="center" prop="pipelineNumber" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="支架形式" align="center" prop="supportType" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="检查内容及标准" align="center">
+        <el-table-column label="管部" align="center" prop="framePipe" :show-overflow-tooltip="true" width="180" :render-header="renderFramePipe"/>
+        <el-table-column label="根部" align="center" prop="frameRoot" :show-overflow-tooltip="true" width="180" :render-header="renderFrameRoot"/>
+        <el-table-column label="功能件" align="center" prop="functionalPart" :show-overflow-tooltip="true" width="180" :render-header="renderFunctionalPart"/>
+        <el-table-column width="180" label="连接件" align="center" prop="connector" :show-overflow-tooltip="true" :render-header="renderConnector"/>
+      </el-table-column>
+      <el-table-column label="处理结果" align="center" prop="processingResult" :show-overflow-tooltip="true"
+                       width="180"/>
+      <el-table-column label="确认人" align="center" prop="confirm1" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm1) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true"
-                       width="150">
+      <el-table-column label="检查人" align="center" prop="confirm2" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm2) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查人" align="center" prop="examiner" :show-overflow-tooltip="true"
-                       width="150">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.examiner) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width"
+                       v-if="isApprove==0">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -361,14 +352,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['pssr:frame:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['pssr:frame:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -385,51 +378,51 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <!--<el-form-item label="内容表id" prop="subId">-->
-          <!--<el-input v-model="form.subId" placeholder="请输入内容表id" />-->
+        <!--<el-input v-model="form.subId" placeholder="请输入内容表id" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="审批id" prop="approveId">-->
-          <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
+        <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
         <!--</el-form-item>-->
         <el-form-item label="所在区域" prop="region">
-          <el-input v-model="form.region" placeholder="请输入所在区域" />
+          <el-input v-model="form.region" placeholder="请输入所在区域"/>
         </el-form-item>
         <el-form-item label="支架编号" prop="bracketNumber">
-          <el-input v-model="form.bracketNumber" placeholder="请输入支架编号" />
+          <el-input v-model="form.bracketNumber" placeholder="请输入支架编号"/>
         </el-form-item>
         <el-form-item label="管线号" prop="pipelineNumber">
-          <el-input v-model="form.pipelineNumber" placeholder="请输入管线号" />
+          <el-input v-model="form.pipelineNumber" placeholder="请输入管线号"/>
         </el-form-item>
         <el-form-item label="设备位号" prop="devNo">
-          <el-input v-model="form.devNo" placeholder="请输入设备位号" />
+          <el-input v-model="form.devNo" placeholder="请输入设备位号"/>
         </el-form-item>
         <el-form-item label="支架形式" prop="supportType">
-          <el-input v-model="form.supportType" placeholder="请输入支架形式" />
+          <el-input v-model="form.supportType" placeholder="请输入支架形式"/>
         </el-form-item>
         <el-form-item label="管部" prop="framePipe">
-          <el-input v-model="form.framePipe" placeholder="请输入管部" />
+          <el-input v-model="form.framePipe" placeholder="请输入管部"/>
         </el-form-item>
         <el-form-item label="根部" prop="frameRoot">
-          <el-input v-model="form.frameRoot" placeholder="请输入根部" />
+          <el-input v-model="form.frameRoot" placeholder="请输入根部"/>
         </el-form-item>
         <el-form-item label="功能件" prop="functionalPart">
-          <el-input v-model="form.functionalPart" placeholder="请输入功能件" />
+          <el-input v-model="form.functionalPart" placeholder="请输入功能件"/>
         </el-form-item>
         <el-form-item label="连接件" prop="connector">
-          <el-input v-model="form.connector" placeholder="请输入连接件" />
+          <el-input v-model="form.connector" placeholder="请输入连接件"/>
         </el-form-item>
         <el-form-item label="处理结果" prop="processingResult">
-          <el-input v-model="form.processingResult" placeholder="请输入处理结果" />
+          <el-input v-model="form.processingResult" placeholder="请输入处理结果"/>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
+        <el-form-item label="检查人" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
-                     placeholder="请选择确认人1">
+                     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="确认人2" prop="confirm2">
+        <el-form-item label="确认人" prop="confirm2">
           <el-select v-model="form.confirm2" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人2">
             <el-option v-for="user in userOptions"
@@ -438,109 +431,112 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查人" prop="examiner">
-          <el-select v-model="form.examiner" 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="选择确认时间">
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择确认时间">
           </el-date-picker>
         </el-form-item>
         <!--<el-form-item label="删除状态" prop="delFlag">-->
-          <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
+        <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="创建人" prop="createrCode">-->
-          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
+        <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="创建时间" prop="createdate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.createdate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择创建时间">-->
-          <!--</el-date-picker>-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+        <!--v-model="form.createdate"-->
+        <!--type="date"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--placeholder="选择创建时间">-->
+        <!--</el-date-picker>-->
         <!--</el-form-item>-->
         <!--<el-form-item label="修改人" prop="updaterCode">-->
-          <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
+        <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="修改时间" prop="updatedate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.updatedate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择修改时间">-->
-          <!--</el-date-picker>-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+        <!--v-model="form.updatedate"-->
+        <!--type="date"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--placeholder="选择修改时间">-->
+        <!--</el-date-picker>-->
         <!--</el-form-item>-->
         <!--<el-form-item label="部门编号" prop="deptId">-->
-          <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
+        <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
         <!--</el-form-item>-->
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
-          <!--<el-form-item label="归属部门" prop="deptId">-->
-              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="归属部门" prop="deptId">-->
+        <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <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="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处，或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</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
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listFrame, getFrame, delFrame, addFrame, updateFrame, exportFrame, importTemplate, handleConfirmFrame, handleTurnDownFrame } from "@/api/pssr/frame";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addFrame,
+  delFrame,
+  exportFrame,
+  getFrame,
+  handleConfirmFrame,
+  handleTurnDownFrame,
+  importTemplate,
+  listFrame,
+  updateFrame
+} from "@/api/pssr/frame";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {
-  dicts:['pssr_approve_status'],
+  dicts: ['pssr_approve_status'],
   name: "Frame",
-  components: { Treeselect },
+  components: {Treeselect},
   props: {
     subId: {
       type: Number,
@@ -572,24 +568,24 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 是否显示弹出层
       open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层（用户导入）
-            open: false,
-            // 弹出层标题（用户导入）
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/frame/importData"
-        },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/frame/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -625,16 +621,16 @@ export default {
     };
   },
   watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight - 350
-      })
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 350
+    })
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -651,12 +647,12 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -703,7 +699,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -746,56 +742,56 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delFrame(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delFrame(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有支（吊）架数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportFrame(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportFrame(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      },
     /** 确认按钮操作*/
     handleApprove() {
       doApprove(this.subId).then(res => {
@@ -841,6 +837,108 @@ export default {
           return item.nickName
         }
       }
-    },  }
+    },
+    renderFramePipe(h, {column, $index}) {
+      let _this = this
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: '1. 管部组件是否有变形、严重锈蚀或断裂；2. 焊缝是否有开裂；',
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
+    renderFrameRoot(h, {column, $index}) {
+      let _this = this
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: '1. 根部组件是否有变形、严重锈蚀或断裂\n' +
+                '2. 焊缝是否有开裂；\n' +
+                '3. 导向机构的滑动部位有无杂物影响设备/管道的自由膨胀和伸缩；\n' +
+                '4. 限位装置或导向机构的滑动副（如PTFE板）是否变形或老化等',
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
+    renderFunctionalPart(h, {column, $index}) {
+      let _this = this
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: '1. 弹簧是否有严重锈蚀、折迭、分层、裂纹或断裂等缺陷；\n' +
+                '2. 弹簧是否有压并或松脱，载荷指示销是否到顶或到底；\n' +
+                '3. 转体部位是否有卡阻；\n' +
+                '4. 组合支吊架是否有偏载或单边失载；',
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
+    renderConnector(h, {column, $index}) {
+      let _this = this
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: '1. 筒节及其组件否有严重锈蚀或开裂；\n' +
+                '2. 支（吊）杆是否有严重锈蚀或松脱；\n' +
+                '3. 锁紧螺母是否已锁紧；\n' +
+                '4. 锁定装置是否已解除；',
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
+  }
 };
 </script>

ui/src/views/pssr/lock/index.vue

@@ -180,7 +180,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
+      <el-table-column label="操作" align="center" fixed="right" width="120"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -214,7 +214,7 @@
     />
 
     <!-- 添加或修改锁开锁关阀门状态对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" v-if="isApprove==0" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="85px">
         <el-form-item label="PID图号" prop="pidNos">
           <el-select v-model="form.pidNos" clearable :disabled="isEdit" multiple filterable style="width: 100%;"
@@ -253,29 +253,29 @@
       </div>
     </el-dialog>
 
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="approveOpen" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" v-if="isApprove!=0" :visible.sync="approveOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
-        <el-form-item label="位置正确(✔/✖)" prop="positionRight" v-if="isApprove==1">
+        <el-form-item label="位置正确(✔/✖)" prop="positionRight">
           <el-radio v-model="form.positionRight" label="✔" border>✔</el-radio>
           <el-radio v-model="form.positionRight" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="状态一致(✔/✖)" prop="statusRight" v-if="isApprove==1">
+        <el-form-item label="状态一致(✔/✖)" prop="statusRight">
           <el-radio v-model="form.statusRight" label="✔" border>✔</el-radio>
           <el-radio v-model="form.statusRight" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="编号一直(✔/✖)" prop="fastening" v-if="isApprove==1">
-          <el-radio v-model="form.fastening" label="✔" border>✔</el-radio>
-          <el-radio v-model="form.fastening" label="✖" border>✖</el-radio>
+        <el-form-item label="编号一致(✔/✖)" prop="fastening">
+          <el-radio v-model="form.codeAccord" label="✔" border>✔</el-radio>
+          <el-radio v-model="form.codeAccord" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="紧固(✔/✖)" prop="fastening" v-if="isApprove==1">
+        <el-form-item label="紧固(✔/✖)" prop="fastening" >
           <el-radio v-model="form.fastening" label="✔" border>✔</el-radio>
           <el-radio v-model="form.fastening" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="锁体完好(✔/✖)" prop="noDamage" v-if="isApprove==1">
+        <el-form-item label="锁体完好(✔/✖)" prop="noDamage">
           <el-radio v-model="form.noDamage" label="✔" border>✔</el-radio>
           <el-radio v-model="form.noDamage" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate" v-if="isApprove==2">
+        <el-form-item label="确认时间" prop="confirmationDate" v-if="isApprove==5">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"
@@ -443,6 +443,11 @@ export default {
         confirm: [{required: true, message: "人员不可为空", trigger: "blur"}],
         lockeder: [{required: true, message: "人员不可为空", trigger: "blur"}],
         pidNos: [{required: true, message: "PID图号不可为空", trigger: "blur"}],
+        noDamage: [{required: true, message: "请选择必选项", trigger: "blur"}],
+        fastening: [{required: true, message: "请选择必选项", trigger: "blur"}],
+        statusRight: [{required: true, message: "请选择必选项", trigger: "blur"}],
+        positionRight: [{required: true, message: "请选择必选项", trigger: "blur"}],
+        codeAccord: [{required: true, message: "请选择必选项", trigger: "blur"}],
       }
     };
   },

ui/src/views/pssr/material/index.vue

@@ -171,16 +171,11 @@
       <el-table-column label="Quantity" align="center" prop="quantity" :show-overflow-tooltip="true"/>
       <el-table-column label="Unit" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="Note" align="center" prop="note" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
+      <el-table-column label="确认人" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm1) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.confirm2) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
@@ -226,16 +221,8 @@
         <el-form-item label="Note" prop="note">
           <el-input v-model="form.note" placeholder="请输入Note"/>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
-          <el-select v-model="form.confirm1" filterable 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">
-          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人1">
+        <el-form-item label="确认人" prop="confirm1">
+          <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
@@ -257,23 +244,15 @@
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
-          <el-select v-model="form.confirm1" filterable 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">
-          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人1">
+        <el-form-item label="确认人" prop="confirm1">
+          <el-select v-model="form.confirm1" filterable 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-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

ui/src/views/pssr/materialRaw/index.vue

@@ -171,16 +171,11 @@
       <el-table-column label="Quantity" align="center" prop="quantity" :show-overflow-tooltip="true"/>
       <el-table-column label="Unit" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="Note" align="center" prop="note" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
+      <el-table-column label="确认人" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm1) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ userFormat(scope.row.confirm2) }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="确认时间" align="center" prop="confirmationDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
@@ -226,16 +221,8 @@
         <el-form-item label="Note" prop="note">
           <el-input v-model="form.note" placeholder="请输入Note"/>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
-          <el-select v-model="form.confirm1" filterable 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">
-          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人1">
+        <el-form-item label="确认人" prop="confirm1">
+          <el-select v-model="form.confirm" filterable placeholder="请选择确认人1">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
@@ -261,16 +248,8 @@
         <el-form-item label="Note" prop="note">
           <el-input v-model="form.note" placeholder="请输入Note"/>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
-          <el-select v-model="form.confirm1" filterable 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">
-          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人1">
+        <el-form-item label="确认人" prop="confirm1">
+          <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
@@ -292,16 +271,8 @@
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirm1">
-          <el-select v-model="form.confirm1" filterable 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">
-          <el-select v-model="form.confirm2" filterable placeholder="请选择确认人1">
+        <el-form-item label="确认人" prop="confirm1">
+          <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"

ui/src/views/pssr/pipe/index.vue

@@ -133,6 +133,7 @@
           size="mini"
           @click="handleSync"
           v-hasPermi="['pssr:pipe:add']"
+          v-if="isApprove==0"
         >同步特种设备数据
         </el-button>
       </el-col>
@@ -280,7 +281,8 @@
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirmer1">
+        <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"
@@ -289,7 +291,8 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认人2" prop="confirmer2">
+        <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"
@@ -298,7 +301,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间确认" prop="confirmationDate">
+        <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

ui/src/views/pssr/subcontent/index.vue

@@ -35,48 +35,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['pssr:subcontent:add']"
-              >新增
-              </el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="success"
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['pssr:subcontent:edit']"
-              >修改
-              </el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['pssr:subcontent:remove']"
-              >删除
-              </el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="info"
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleImport"
-                v-hasPermi="['pssr:subcontent:edit']"
-              >导入
-              </el-button>
-            </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -252,6 +210,10 @@ export default {
     clientHeight: {
       type: Number,
       default: 300
+    },
+    taskType: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -309,6 +271,7 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
+        taskType: this.taskType,
         remarks: null
       },
       // 表单参数

ui/src/views/pssr/vessel/index.vue

@@ -132,6 +132,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleSync"
+          v-if="isApprove==0"
           v-hasPermi="['pssr:vessel:add']"
         >同步特种设备数据
         </el-button>
@@ -142,6 +143,7 @@
           icon="el-icon-edit"
           size="mini"
           :disabled="multiple"
+          v-if="isApprove==0"
           @click="handleBatch"
           v-hasPermi="['pssr:vessel:edit']"
         >批量操作
@@ -321,7 +323,8 @@
         <el-form-item>
           <span>已选择 {{ ids.length }} 条数据</span>
         </el-form-item>
-        <el-form-item label="确认人1" prop="confirmer1">
+        <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"
@@ -330,7 +333,8 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认人2" prop="confirmer2">
+        <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"
@@ -339,7 +343,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间确认" prop="confirmationDate">
+        <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"