设备变更

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -120,6 +120,10 @@ public class ActivitiConfig {
         DeploymentBuilder deploymentBuilder7 = repositoryService().createDeployment();
         Resource spec7 = resourceLoader.getResource("classpath:/processes/specTraining/specTrainingPlanProcess.bpmn"); //加载流程图资源文件
         deploymentBuilder7.enableDuplicateFiltering().addInputStream(spec7.getFilename(), spec7.getInputStream()).name("专项培训计划审核").deploy();//按流程id部署
+
+        DeploymentBuilder deploymentBuilder8 = repositoryService().createDeployment();
+        Resource spec8 = resourceLoader.getResource("classpath:/processes/intact/intactChangeApplicationProcess.bpmn"); //加载流程图资源文件
+        deploymentBuilder8.enableDuplicateFiltering().addInputStream(spec8.getFilename(), spec8.getInputStream()).name("设备变更申请流程").deploy();//按流程id部署
     }
 }
 

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -17,6 +17,8 @@ import com.ruoyi.project.common.domain.TCommonfile;
 import com.ruoyi.project.common.service.ITCommonfileService;
 import com.ruoyi.project.ehs.domain.TApproveAccident;
 import com.ruoyi.project.ehs.service.ITApproveAccidentService;
+import com.ruoyi.project.intact.domain.TIntactApprove;
+import com.ruoyi.project.intact.service.ITIntactApproveService;
 import com.ruoyi.project.listener.*;
 import com.ruoyi.project.sems.domain.TApprove;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
@@ -97,6 +99,8 @@ public class TApproveDangerController extends BaseController
     private ITStApproveService tStApproveService;
     @Autowired
     private RepositoryService repositoryService;
+    @Autowired
+    private ITIntactApproveService tIntactApproveService;
     /**
      * 任务申请
      */
@@ -326,7 +330,13 @@ public class TApproveDangerController extends BaseController
                     logger.info("专项培训计划审核" +JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
+                }else if (pi.getProcessDefinitionName().equals("设备变更申请流程")) {
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    logger.info("设备变更申请流程" +JSON.toJSONString(approve));
+                    devTask.setApproveObj(approve);
+                    devTask.setApNo(approve.getApNo());
                 }
+
                 list.add(devTask);
             }
         }

master/src/main/java/com/ruoyi/project/intact/domain/TIntactGj.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.intact.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -265,7 +266,7 @@ public class TIntactGj extends BaseEntity
     private String archives;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    @TableField(exist = false)
     private String deptName;
 
     public void setDeptName(String deptName)

master/src/main/java/com/ruoyi/project/intact/domain/TIntactPump.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.intact.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -266,7 +267,7 @@ public class TIntactPump extends BaseEntity
     private String archives;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+    @TableField(exist = false)
     private String deptName;
 
     public void setDeptName(String deptName)

master/src/main/java/com/ruoyi/project/intact/domain/TIntactYsj.java

@@ -120,6 +120,14 @@ public class TIntactYsj extends BaseEntity
     @TableField(exist = false)
     private String deptName;
 
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
 
 
 
@@ -349,6 +357,26 @@ public class TIntactYsj extends BaseEntity
         return archives;
     }
 
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactGjMapper.java

@@ -3,7 +3,9 @@ package com.ruoyi.project.intact.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactApprove;
 import com.ruoyi.project.intact.domain.TIntactGj;
 
 /**
@@ -13,7 +15,7 @@ import com.ruoyi.project.intact.domain.TIntactGj;
  * @date 2022-06-22
  */
 @TableName("T_INTACT_GJ")
-public interface TIntactGjMapper 
+public interface TIntactGjMapper  extends BaseMapper<TIntactGj>
 {
     /**
      * 查询设备完整性管件台账

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactGylMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactApprove;
 import com.ruoyi.project.intact.domain.TIntactGyl;
 
 /**
@@ -10,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactGyl;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface TIntactGylMapper 
+public interface TIntactGylMapper  extends BaseMapper<TIntactGyl>
 {
     /**
      * 查询设备完整性工业炉台账

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactPumpMapper.java

@@ -3,7 +3,9 @@ package com.ruoyi.project.intact.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactApprove;
 import com.ruoyi.project.intact.domain.TIntactPump;
 
 /**
@@ -13,7 +15,7 @@ import com.ruoyi.project.intact.domain.TIntactPump;
  * @date 2022-06-22
  */
 @TableName("T_INTACT_PUMP")
-public interface TIntactPumpMapper 
+public interface TIntactPumpMapper  extends BaseMapper<TIntactPump>
 {
     /**
      * 查询设备完整性泵台账

master/src/main/java/com/ruoyi/project/intact/mapper/TIntactYsjMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.intact.domain.TIntactApprove;
 import com.ruoyi.project.intact.domain.TIntactYsj;
 
 /**
@@ -10,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactYsj;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface TIntactYsjMapper 
+public interface TIntactYsjMapper  extends BaseMapper<TIntactYsj>
 {
     /**
      * 查询设备完整性压缩机台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactGjService.java

@@ -1,7 +1,11 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.intact.domain.TIntactGj;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 
 /**
  * 设备完整性管件台账Service接口
@@ -9,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactGj;
  * @author ruoyi
  * @date 2022-06-22
  */
-public interface ITIntactGjService 
+public interface ITIntactGjService extends IService<TIntactGj>
 {
     /**
      * 查询设备完整性管件台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactGylService.java

@@ -1,7 +1,11 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.intact.domain.TIntactGyl;
+import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 
 /**
  * 设备完整性工业炉台账Service接口
@@ -9,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactGyl;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface ITIntactGylService 
+public interface ITIntactGylService extends IService<TIntactGyl>
 {
     /**
      * 查询设备完整性工业炉台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactPumpService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.project.intact.domain.TIntactPump;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 
 /**
  * 设备完整性泵台账Service接口
@@ -9,7 +12,7 @@ import com.ruoyi.project.intact.domain.TIntactPump;
  * @author ruoyi
  * @date 2022-06-22
  */
-public interface ITIntactPumpService 
+public interface ITIntactPumpService extends IService<TIntactPump>
 {
     /**
      * 查询设备完整性泵台账

master/src/main/java/com/ruoyi/project/intact/service/ITIntactYsjService.java

@@ -1,7 +1,11 @@
 package com.ruoyi.project.intact.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.intact.domain.TIntactPump;
 import com.ruoyi.project.intact.domain.TIntactYsj;
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 
 /**
  * 设备完整性压缩机台账Service接口
@@ -9,7 +13,7 @@ import com.ruoyi.project.intact.domain.TIntactYsj;
  * @author ruoyi
  * @date 2022-06-21
  */
-public interface ITIntactYsjService 
+public interface ITIntactYsjService  extends IService<TIntactYsj>
 {
     /**
      * 查询设备完整性压缩机台账

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactGjServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactGjMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactGjService;
  * @date 2022-06-22
  */
 @Service
-public class TIntactGjServiceImpl implements ITIntactGjService
+public class TIntactGjServiceImpl extends ServiceImpl<TIntactGjMapper, TIntactGj> implements ITIntactGjService
 {
     @Autowired
     private TIntactGjMapper tIntactGjMapper;

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactGylServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactGylMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactGylService;
  * @date 2022-06-21
  */
 @Service
-public class TIntactGylServiceImpl implements ITIntactGylService
+public class TIntactGylServiceImpl extends ServiceImpl<TIntactGylMapper, TIntactGyl> implements ITIntactGylService
 {
     @Autowired
     private TIntactGylMapper tIntactGylMapper;

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactPumpServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactPumpMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactPumpService;
  * @date 2022-06-22
  */
 @Service
-public class TIntactPumpServiceImpl implements ITIntactPumpService
+public class TIntactPumpServiceImpl extends ServiceImpl<TIntactPumpMapper, TIntactPump> implements ITIntactPumpService
 {
     @Autowired
     private TIntactPumpMapper tIntactPumpMapper;

master/src/main/java/com/ruoyi/project/intact/service/impl/TIntactYsjServiceImpl.java

@@ -1,6 +1,10 @@
 package com.ruoyi.project.intact.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.project.sems.domain.TApprove;
+import com.ruoyi.project.sems.mapper.TApproveMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.intact.mapper.TIntactYsjMapper;
@@ -14,7 +18,7 @@ import com.ruoyi.project.intact.service.ITIntactYsjService;
  * @date 2022-06-21
  */
 @Service
-public class TIntactYsjServiceImpl implements ITIntactYsjService
+public class TIntactYsjServiceImpl extends ServiceImpl<TIntactYsjMapper, TIntactYsj> implements ITIntactYsjService
 {
     @Autowired
     private TIntactYsjMapper tIntactYsjMapper;

master/src/main/java/com/ruoyi/project/sems/controller/TApproveController.java

@@ -242,6 +242,7 @@ public class TApproveController extends BaseController
         logger.info("流程实例id：" + pi.getProcessInstanceId());
         tApprove.setProcessId(pi.getProcessInstanceId());
         tApproveService.updateTApprove(tApprove);
+
         return AjaxResult.success();
     }
 

master/src/main/resources/processes/intact/intactChangeApplicationProcess.bpmn

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/testm1656032909040" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1656032909040" name="" targetNamespace="http://www.activiti.org/testm1656032909040" typeLanguage="http://www.w3.org/2001/XMLSchema">
+  <process id="intactChangeApplication" isClosed="false" isExecutable="true" name="设备变更申请" processType="None">
+    <startEvent id="startEquipmentApplication" name="提交申请"/>
+    <userTask activiti:exclusive="true" id="gyzjTask" name="工艺总监"/>
+    <endEvent id="endevent3" name="设备变更申请已通过"/>
+    <sequenceFlow id="_10" sourceRef="gyzjTask" targetRef="endevent3"/>
+    <endEvent id="endevent2" name="申请未通过"/>
+    <sequenceFlow id="_13" sourceRef="gyzjTask" targetRef="endevent2"/>
+    <sequenceFlow id="_2" sourceRef="startEquipmentApplication" targetRef="gyzjTask"/>
+  </process>
+  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
+    <bpmndi:BPMNPlane bpmnElement="intactChangeApplication">
+      <bpmndi:BPMNShape bpmnElement="startEquipmentApplication" id="Shape-startEquipmentApplication">
+        <dc:Bounds height="32.0" width="32.0" x="205.0" y="55.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="gyzjTask" id="Shape-gyzjTask">
+        <dc:Bounds height="55.0" width="85.0" x="410.0" y="40.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent3" id="Shape-endevent3">
+        <dc:Bounds height="32.0" width="32.0" x="435.0" y="425.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="Shape-endevent2">
+        <dc:Bounds height="32.0" width="32.0" x="650.0" y="190.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="gyzjTask" targetElement="endevent2">
+        <di:waypoint x="495.0" y="67.5"/>
+        <di:waypoint x="650.0" y="206.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_2" id="BPMNEdge__2" sourceElement="startEquipmentApplication" targetElement="gyzjTask">
+        <di:waypoint x="237.0" y="71.0"/>
+        <di:waypoint x="410.0" y="67.5"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="_10" id="BPMNEdge__10" sourceElement="gyzjTask" targetElement="endevent3">
+        <di:waypoint x="451.0" y="95.0"/>
+        <di:waypoint x="451.0" y="425.0"/>
+        <bpmndi:BPMNLabel>
+          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

ui/src/views/intact/approve/index.vue

@@ -464,7 +464,7 @@
     importTemplate,
     listApprove,
     updateApprove
-  } from "@/api/sems/approve";
+  } from "@/api/intact/approve";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";

ui/src/views/intact/approve/tapprove-add.vue

@@ -215,169 +215,7 @@
           :label="$t('设计压力')+'（MPa）'">
         </el-table-column>
       </el-table>
-      <el-table
-        v-show="dataForm.devType == 5"
-        :data="devList"
-        border
-        style="width: 100%;">
-        <el-table-column
-          prop="plantCode"
-          header-align="center"
-          align="center"
-          :label="$t('装置名称')">
-        </el-table-column>
-        <el-table-column
-          prop="docno"
-          header-align="center"
-          align="center"
-          :label="$t('docNo')">
-        </el-table-column>
-        <el-table-column
-          prop="devname"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="150"
-          :label="$t('设备名称')">
-        </el-table-column>
-        <el-table-column
-          prop="model"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('型号')">
-        </el-table-column>
-        <el-table-column
-          prop="location"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          :label="$t('使用地点')">
-        </el-table-column>
-      </el-table>
-      <el-table
-        v-show="dataForm.devType == 6"
-        :data="devList"
-        border
-        style="width: 100%;">
-        <el-table-column
-          prop="plantCode"
-          header-align="center"
-          align="center"
-          :label="$t('装置名称')">
-        </el-table-column>
-        <el-table-column
-          prop="useDept"
-          header-align="center"
-          align="center"
-          :label="$t('dept')">
-        </el-table-column>
-        <el-table-column
-          prop="carNo"
-          header-align="center"
-          align="center"
-          :label="$t('plateNo')">
-        </el-table-column>
-        <el-table-column
-          prop="docno"
-          header-align="center"
-          align="center"
-          :label="$t('docNo')">
-        </el-table-column>
-        <el-table-column
-          prop="model"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('model')">
-        </el-table-column>
-      </el-table>
-      <el-table
-        v-show="dataForm.devType == 7"
-        :data="devList"
-        border
-        style="width: 100%;">
-        <el-table-column
-          prop="plantCode"
-          header-align="center"
-          align="center"
-          :label="$t('装置名称')">
-        </el-table-column>
-        <el-table-column
-          prop="unit"
-          header-align="center"
-          align="center"
-          :label="$t('单元')">
-        </el-table-column>
-        <el-table-column
-          prop="devno"
-          header-align="center"
-          align="center"
-          :label="$t('位号')">
-        </el-table-column>
-        <el-table-column
-          prop="devname"
-          header-align="center"
-          align="center"
-          :label="$t('名称')">
-        </el-table-column>
-        <el-table-column
-          prop="createno"
-          header-align="center"
-          align="center"
-          :label="$t('制造编号')">
-        </el-table-column>
-        <el-table-column
-          prop="indiameter"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('内径')+'mm'">
-        </el-table-column>
-        <el-table-column
-          prop="height"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('高(长)')+'mm'">
-        </el-table-column>
-        <el-table-column
-          prop="chickness"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('壁厚(mm)')">
-        </el-table-column>
-        <el-table-column
-          prop="volume"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('容积mm³')">
-        </el-table-column>
-        <el-table-column
-          prop="medium"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('介质')">
-        </el-table-column>
-        <el-table-column
-          prop="material"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120"
-          :label="$t('材料')">
-        </el-table-column>
-      </el-table>
+  
     </el-form-item>
       <el-form-item :label="$t('审批类型')" prop="approveType">
         <el-select v-model="dataForm.approveType" :placeholder="$t('审批类型')" @change="handleChange">
@@ -395,50 +233,8 @@
                   maxlength="200" show-word-limit
                   :autosize="{ minRows: 2, maxRows: 10}"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('附件')" prop="fileUrl">
-        <el-upload
-          ref="doc"
-          :limit="5"
-          :headers="doc.headers"
-          :action="doc.url"
-          :disabled="doc.isUploading"
-          :on-progress="handleFileDocProgress"
-          :on-success="handleFileDocSuccess"
-          :on-remove="handleRemove"
-          :auto-upload="true"
-          :file-list="fileList"
-          drag
-        >
-          <i class="el-icon-upload"></i>
-          <div class="el-upload__text">
-            {{ $t('将文件拖到此处，或') }}
-            <em>{{ $t('点击上传') }}</em>
-          </div>
-          <div v-if="showDelay" class="el-upload__tip" slot="tip">{{ this.fileTips }}</div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item :label="$t('维修经理')" prop="wxjl">
-        <el-select v-model="dataForm.wxjl" filterable :placeholder="$t('请选择') + $t('维修经理')">
-          <el-option
-            v-for="item in wxjlOption"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('工艺经理')" prop="gyjl">
-        <el-select v-model="dataForm.gyjl" filterable :placeholder="$t('请选择') + $t('工艺经理')">
-          <el-option
-            v-for="item in gyjlOption"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
+  
+    
       <el-form-item :label="$t('工艺总监')" prop="gyzj">
         <el-select v-model="dataForm.gyzj" filterable :placeholder="$t('请选择') + $t('工艺总监')">
           <el-option
@@ -450,28 +246,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('维修总监')" prop="wxzj">
-        <el-select v-model="dataForm.wxzj" filterable :placeholder="$t('请选择') + $t('维修总监')">
-          <el-option
-            v-for="item in wxzjOption"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('政府回执')" prop="zf">
-        <el-select v-model="dataForm.zf" filterable :placeholder="$t('请输入') + $t('政府回执')">
-          <el-option
-            v-for="item in zfOption"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-            :disabled="item.disabled">
-          </el-option>
-        </el-select>
-      </el-form-item>
+  
       <template v-if="dataForm.approveType == 5">
         <el-form-item :label="$t('延期日期')" prop="delayDate">
           <el-form-item prop="endTime">
@@ -509,7 +284,7 @@
 
 <script>
   import {getToken} from "@/utils/auth";
-  import {addApprove, getApprove} from "@/api/sems/approve";
+  import {addApprove, getApprove} from "@/api/intact/approve";
   import {listPostUser} from "@/api/system/user";
 
   export default {
@@ -613,33 +388,15 @@
       this.fileList = []
       this.devList = rows
 
-      listPostUser({
-        // postCode: 'wxjl'
-      }).then(response => {
-        this.wxjlOption = response;
-      });
-      listPostUser({
-        // postCode: 'gyjl'
-      }).then(response => {
-        this.gyjlOption = response;
-      });
       listPostUser({
         // postCode: 'gyzj'
       }).then(response => {
         this.gyzjOption = response;
       });
-      listPostUser({
-        // postCode: 'wxzj'
-      }).then(response => {
-        this.wxzjOption = response;
-      });
-      listPostUser({
-        // postCode: 'sems'
-      }).then(response => {
-        this.zfOption = response;
-      });
+  
+    
       console.log(type)
-      this.getDicts("spec_approve_type").then(response => {
+      this.getDicts("INTACT_APPROVE_TYPE").then(response => {
         this.approveOption = response.data;
         for (let i = 0; i < this.approveOption.length ; i++) {
           if(this.approveOption[i].dictValue == this.devList[0].status){

ui/src/views/intact/approve/tapprove-his.vue

@@ -38,12 +38,12 @@
 </template>
 
 <script>
-import { listApprove, getApprove,listHisApprove, delApprove, addApprove, updateApprove, exportApprove, importTemplate} from "@/api/sems/approve";
+import { listApprove, getApprove,listHisApprove, delApprove, addApprove, updateApprove, exportApprove, importTemplate} from "@/api/intact/approve";
 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 AddOrUpdate from '../../approve/approveDetail/spec-detail';
+import AddOrUpdate from '../../approve/approveDetail/intact_detail';
 import Editor from '@/components/Editor';
 
 export default {
@@ -144,10 +144,10 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    this.getDicts("spec_dev_type").then(response => {
+    this.getDicts("INTACT_DEVTYPE").then(response => {
       this.devTypeOptions = response.data;
     });
-    this.getDicts("spec_approve_type").then(response => {
+    this.getDicts("INTACT_APPROVE_TYPE").then(response => {
       this.approveTypeOptions = response.data;
     });
     this.getDicts("spec_approve_res").then(response => {
@@ -158,8 +158,9 @@ export default {
     init (row, type) {
       this.visible = true
       this.loading = true;
+    //  console.log(row.devType)
       this.queryParams.devId = row.id
-      this.queryParams.devType = row.devType
+      this.queryParams.devType = type
       listHisApprove(this.queryParams).then(response => {
         this.approveList = response.data;
         this.total = response.total;
@@ -331,9 +332,12 @@ export default {
     //操作审批流程
     detailHandle (row) {
         this.specDealVisible = true
+      
         this.$nextTick(() => {
           console.log(row.taskName)
+          
           this.$refs.specDeal.init(row.id, row.taskId, row.processId,row.taskName)
+            
         })
 
     },

ui/src/views/intact/gj/index.vue

@@ -1015,6 +1015,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      devType: 2,
       // 遮罩层
       loading: true,
       // 选中数组

ui/src/views/intact/gyl/index.vue

@@ -962,6 +962,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      devType: 4,
       // 遮罩层
       loading: true,
       // 选中数组

ui/src/views/intact/pump/index.vue

@@ -676,26 +676,14 @@
               type="text"
               size="mini"
               @click="addAprrove(scope.row,devType)"
-            >{{ $t('提交申请') }}</el-button>
+            >{{ $t('提交变更申请') }}</el-button>
           <el-button
             v-if="scope.row.approveTime != null"
             type="text"
             size="small"
             @click="hisApprove(scope.row,devType)">
             {{ $t('申请记录') }}</el-button>
-          <br>
-          <el-button
-            style="margin-left: 0px"
-            type="text"
-            size="mini"
-            @click="checkList(scope.row,devType)"
-          >{{ $t('检验和检查记录') }}</el-button>
-          <el-button
-            v-if="scope.row.hiFlag!= 0"
-            type="text"
-            size="mini"
-            @click="hisReform(scope.row)"
-          >{{ $t('改造记录') }}</el-button>
+    
         </template>
       </el-table-column>
     </el-table>
@@ -1094,6 +1082,7 @@ export default {
   components: { Treeselect ,AddApprove,HisApprove,HisCheck,HisReform},
   data() {
     return {
+      devType: 1,
       // 遮罩层
       loading: true,
        addAprroveVisible: false,
@@ -1264,7 +1253,7 @@ export default {
     this.getDicts("INTACT_STATUS").then(response => {
       this.statusOptions = response.data;
     });
-    this.getDicts("spec_approve_status").then(response => {
+    this.getDicts("T_INTACT_CHANGE_STATUS").then(response => {
       this.approveStatusOptions = response.data;
     });
     this.getDicts("ALARM_LEVEL").then(response => {
@@ -1566,6 +1555,7 @@ export default {
     },
     hisApprove (row, type) {
       this.hisAprroveVisible = true
+      
       this.$nextTick(() => {
         this.$refs.hisApprove.init(row, type)
       })

ui/src/views/intact/ysj/index.vue

@@ -557,6 +557,7 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      devType: 3,
       // 遮罩层
       loading: true,
       // 选中数组