审批流程及office预览的代码逻辑更改

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

@@ -441,6 +441,12 @@ public class TApproveDangerController extends BaseController
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
+                }else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
+                    TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
+                    SysUser user = sysUserService.selectUserById(approve.getUserId());
+                    devProcess.setApNo(approve.getApNo());
+                    devProcess.setApName(user.getNickName());
+                    devProcess.setApproveObject(approve);
                 }else {
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());

master/src/main/java/com/ruoyi/project/officeConvert/OfficeConvertController.java

@@ -34,12 +34,7 @@ import static com.ruoyi.project.officeConvert.PptPreview.pptxToImage;
 @RestController
 @RequestMapping(value="/office",method = RequestMethod.POST)
 public class OfficeConvertController {
-    /**
-     office类型的文件
-     先远程服务端获取文件
-     然后转换
-     然后读写缓冲区返回前台
-     */
+
     // 第一步：转换器直接注入
     @Resource
     DocumentConverter documentConverter;
@@ -54,12 +49,17 @@ public class OfficeConvertController {
 
     private static  String fileMiss="您需要预览的文件不存在，可能已在本地删除，请重新上传即可！";
 
+
+    /**
+     office类型的文件
+     先远程服务端获取文件
+     然后转换
+     然后读写缓冲区返回前台
+     */
     @PostMapping("/toPdfFile")
     public AjaxResult toPdfFile(HttpServletRequest request, HttpServletResponse response,String filepath) {
         // 获取HttpServletResponse
         response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
-
-
         String newFilePath=filepath.replace("/profile","");
         // 需要转换的文件路径
         File file = new File(RuoYiConfig.getProfile()+newFilePath);
@@ -68,7 +68,6 @@ public class OfficeConvertController {
             return new AjaxResult(HttpStatus.SUCCESS,fileMiss,Constants.RESOURCE_PREFIX+ "/" + newFilePath);
         }
         String converterPdf ="";  //生成的文件名
-
         try {
             // 转换之后文件生成的本地地址
             File newFile = new File(RuoYiConfig.getProfile());
@@ -78,40 +77,34 @@ public class OfficeConvertController {
             String name =file.getName();
             int t=name.lastIndexOf(".");
             String newName=name.substring(0,t);
-            //根据文件类型判断转为pdf还是html，主要是预览效果问题
-            if(newFilePath.endsWith("docx")||newFilePath.endsWith("jpg")||newFilePath.endsWith("png")
-                    ||newFilePath.endsWith(".tif")||newFilePath.endsWith(".jpeg")){
-                converterPdf =  newName+".pdf";
-            }else if(newFilePath.endsWith(".csv")){
+            //根据文件类型判断转换方式
+            if(newFilePath.endsWith(".docx")||newFilePath.endsWith(".doc")||newFilePath.endsWith(".xlsx")
+                    ||newFilePath.endsWith(".xls")||newFilePath.endsWith(".csv")||newFilePath.endsWith(".txt")){
                 converterPdf =  newName+".html";
-
-            }else if(newFilePath.endsWith(".mp4")||newFilePath.endsWith("pdf")||newFilePath.endsWith(".gif")){
-                //直接返回源文件路径
+            }else if(newFilePath.endsWith(".mp4")||newFilePath.endsWith("pdf")||newFilePath.endsWith(".gif")
+                    ||newFilePath.endsWith("jpg")||newFilePath.endsWith("png")
+                    ||newFilePath.endsWith(".jpeg")){
+                //浏览器可以直接打开的直接返回图片和视频的文件路径
                 return   new AjaxResult(HttpStatus.SUCCESS,successMsg,Constants.RESOURCE_PREFIX+ "/" + newFilePath) ;
-
-            }else if( newFilePath.endsWith("flv")||newFilePath.endsWith("swf")||
-                    newFilePath.endsWith("3gp")||newFilePath.endsWith("mkv")||newFilePath.endsWith(".dwg")) {
-                //直接返回源文件路径
-                return new AjaxResult(HttpStatus.SUCCESS,failMsg,Constants.RESOURCE_PREFIX+ "/" + newFilePath);
             }else {
-                converterPdf =  newName+".html";
+                //其他类型都不支持就返回错误消息
+                return new AjaxResult(HttpStatus.SUCCESS,failMsg,Constants.RESOURCE_PREFIX+ "/" + newFilePath);
             }
             // 文件转化
             documentConverter.convert(file).to(new File(RuoYiConfig.getProfile() + File.separator +"temp" + File.separator +converterPdf)).execute();
-
-            this.doActionConvertedFile(RuoYiConfig.getProfile() + File.separator +"temp" + File.separator +converterPdf);
+            //office文件需要给有表格的加一个边框 以免 排版出现问题
+           this.doActionConvertedFile(RuoYiConfig.getProfile() + File.separator +"temp" + File.separator +converterPdf);
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         //最后应该返回转换后的文件名称
-
         String pathFileName = Constants.RESOURCE_PREFIX+ File.separator +"temp" + File.separator + converterPdf;
-
-
         return  newFilePath.endsWith(".csv")? new AjaxResult(HttpStatus.SUCCESS,codeMiss,pathFileName): new AjaxResult(HttpStatus.SUCCESS,successMsg,pathFileName) ;
     }
 
+    /**
+    PPT文件需要根据不同格式类型区分一下
+     */
     @PostMapping("/PPTransJPEG")
     public AjaxResult PPTransJPEG(HttpServletRequest request, HttpServletResponse response,String filepath) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -123,8 +116,6 @@ public class OfficeConvertController {
         if(flag==false){
             return new AjaxResult(HttpStatus.SUCCESS,fileMiss,Constants.RESOURCE_PREFIX+ "/" + newFilePath);
         }
-
-        //  String imagePath = Constants.RESOURCE_PREFIX+ "/" +   ;
         File imageFile = new File(RuoYiConfig.getProfile() + File.separator + "temp");
         if (!imageFile.exists()){
             imageFile.mkdirs();
@@ -141,7 +132,6 @@ public class OfficeConvertController {
         //将生成的图片传给前端
         resultMap.put("imagePathList", list);
         //  resultMap.put("reviewUrlPrefix",  Constants.RESOURCE_PREFIX+ "/" );
-
         return  new AjaxResult(HttpStatus.SUCCESS,successMsg,resultMap);
     }
 

master/src/main/resources/processes/kekao/reliability.bpmn

@@ -1,6 +1,6 @@
 <?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:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" 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="m1657259340605" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="kkxglsqlc" isClosed="false" isExecutable="true" processType="None">
+  <process id="kkxglsqlc" isClosed="false" isExecutable="true" name="可靠性管理申请" processType="None">
     <startEvent id="start" name="提交申请"/>
     <userTask activiti:assignee="#{kkxjl}" activiti:exclusive="true" id="kkxjlTask" name="可靠性经理"/>
     <sequenceFlow id="_4" sourceRef="start" targetRef="kkxjlTask"/>

ui/src/api/reliability/approve.js

@@ -69,4 +69,14 @@ export function exportApprove(query) {
     method: 'get',
     params: query
   })
+}
+
+
+// 可靠性管理申请
+export function handleApprove(data) {
+  return request({
+    url: '/reliability/approve/handle',
+    data: data,
+    method: 'put'
+  })
 }

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

@@ -4,1115 +4,9 @@
     :close-on-click-modal="false"
     :visible.sync="visible" append-to-body>
     <el-form :model="taskForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
-      <el-form-item :label="$t('设备')">
-        <el-table
-          v-show="dataForm.approveType == 8"
-          :data="devList"
-          border
-          style="width: 100%;">
-          <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('检查年月')" align="center" prop="checkMonth" width="100">
-          </el-table-column>
-          <el-table-column header-align="center" align="center" :label="$t('压力容器')">
-            <el-table-column :label="$t('容器单元')" align="center" prop="rqUnit" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('容器本体')" align="center" prop="rqSelf" :formatter="rqSelfFormat" />
-            <el-table-column :label="$t('安全附件')" align="center" prop="rqSafe" :formatter="rqSafeFormat" />
-            <el-table-column :label="$t('安全保护装置')" align="center" prop="rqProtect" :formatter="rqProtectFormat" />
-            <el-table-column :label="$t('测量调控装置，紧急切断阀')" align="center" prop="rqControl" :formatter="rqControlFormat" />
-            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="rqIns" :formatter="rqInsFormat" />
-            <el-table-column :label="$t('有无泄漏')" align="center" prop="rqOut" :formatter="rqOutFormat" />
-            <el-table-column :label="$t('其它情况描述')" align="center" prop="rqOther" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('容器备注')" align="center" prop="rqRemark" :show-overflow-tooltip="true"/>
-          </el-table-column>
-          <el-table-column header-align="center" align="center" :label="$t('压力管道')">
-            <el-table-column :label="$t('管道区域/单元')" align="center" prop="gdUnit" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('管道宏观')" align="center" prop="gdSelf" :formatter="gdSelfFormat" />
-            <el-table-column :label="$t('安全附件')" align="center" prop="gdSafe" :formatter="gdSafeFormat" />
-            <el-table-column :label="$t('测量调控装置')" align="center" prop="gdControl" :formatter="gdControlFormat" />
-            <el-table-column :label="$t('附属仪器仪表')" align="center" prop="gdIns" :formatter="gdInsFormat" />
-            <el-table-column :label="$t('有无泄漏')" align="center" prop="gdOut" :formatter="gdOutFormat" />
-            <el-table-column :label="$t('其它情况描述')" align="center" prop="gdOther" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('管道备注')" align="center" prop="gdRemark" :show-overflow-tooltip="true"/>
-          </el-table-column>
-          <el-table-column header-align="center" align="center" :label="$t('锅炉')">
-            <el-table-column :label="$t('锅炉区域/单元')" align="center" prop="glUnit" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('承压部件')" align="center" prop="glPressure" :formatter="glPressureFormat" />
-            <el-table-column :label="$t('安全附件')" align="center" prop="glSafe" :formatter="glSafeFormat" />
-            <el-table-column :label="$t('仪表及联锁保护装置')" align="center" prop="glIns" :formatter="glInsFormat" />
-            <el-table-column :label="$t('燃烧器')" align="center" prop="glBurn" :formatter="glBurnFormat" />
-            <el-table-column :label="$t('人员')+$t('证书')" align="center" prop="glCer" :formatter="glCerFormat" />
-            <el-table-column :label="$t('水质化验')" align="center" prop="glWater" :formatter="glWaterFormat" />
-            <el-table-column :label="$t('其它情况描述')" align="center" prop="glOther" :show-overflow-tooltip="true"/>
-            <el-table-column :label="$t('锅炉')+$t('备注')" align="center" prop="glRemark" :show-overflow-tooltip="true"/>
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.approveType == 7 && dataForm.devType == 1"
-          :data="devList"
-          border
-          style="width: 100%;">
-          <el-table-column :label="$t('装置')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('位号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader">
-          </el-table-column>
-          <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
-          </el-table-column>
-          <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
-          </el-table-column>
-          <el-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
-          </el-table-column>
-          <el-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
-          </el-table-column>
-          <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-          <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
-          </el-table-column>
-          <el-table-column  :label="$t('容器管理')" header-align="center">
-            <el-table-column
-              prop="pj1"
-              header-align="center"
-              align="center"
-              label="1">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('管理制度、操作规程、运行记录')" placement="top">
-                  <span>1</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj2"
-              header-align="center"
-              align="center"
-              label="2">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('设计文件、竣工图样、产品合格证、质量证明文件、安装使用说明')" placement="top">
-                  <span>2</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj3"
-              header-align="center"
-              align="center"
-              label="3">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('监督检验证书以及安装、改造、修理等资料')" placement="top">
-                  <span>3</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj4"
-              header-align="center"
-              align="center"
-              label="4">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('使用登记证，使用登记表是否与实际相符')" placement="top">
-                  <span>4</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj5"
-              header-align="center"
-              align="center"
-              label="5">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('日常维护保养、定期安全检查记录')" placement="top">
-                  <span>5</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj6"
-              header-align="center"
-              align="center"
-              label="6">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('年度检查、定期检验报告齐全，报告中问题解决')" placement="top">
-                  <span>6</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj7"
-              header-align="center"
-              align="center"
-              label="7">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('作业人员定期培训情况')" placement="top">
-                  <span>7</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column  :label="$t('容器本体及运行情况')" header-align="center">
-            <el-table-column
-              prop="pj8"
-              header-align="center"
-              align="center"
-              label="8">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('设备铭牌、漆色、标志、使用证号码')" placement="top">
-                  <span>8</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj9"
-              header-align="center"
-              align="center"
-              label="9">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('本体裂、过热、变形、泄漏、损伤情况')" placement="top">
-                  <span>9</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj10"
-              header-align="center"
-              align="center"
-              label="10">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('接口部位、焊接接头等裂纹、泄漏、损伤情况')" placement="top">
-                  <span>10</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj11"
-              header-align="center"
-              align="center"
-              label="11">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('外表面腐蚀、异常结霜、结露情况')" placement="top">
-                  <span>11</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj12"
-              header-align="center"
-              align="center"
-              label="12">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('保温层、隔热层、衬里情况')" placement="top">
-                  <span>12</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj13"
-              header-align="center"
-              align="center"
-              label="13">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('检漏孔、信号孔')" placement="top">
-                  <span>13</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj14"
-              header-align="center"
-              align="center"
-              label="14">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('容器与相邻管道、构件间异常振动、响声、摩擦')" placement="top">
-                  <span>14</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj15"
-              header-align="center"
-              align="center"
-              label="15">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('支承、支座、基础、紧固螺栓')" placement="top">
-                  <span>15</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj16"
-              header-align="center"
-              align="center"
-              label="16">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('遮阳罩、操作台紧固')" placement="top">
-                  <span>16</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj17"
-              header-align="center"
-              align="center"
-              label="17">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('罐体与底盘等连接')" placement="top">
-                  <span>17</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj18"
-              header-align="center"
-              align="center"
-              label="18">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('波板、罐内扶梯与罐体连接')" placement="top">
-                  <span>18</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj19"
-              header-align="center"
-              align="center"
-              label="19">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('罐车拉紧带、鞍座、中间支座')" placement="top">
-                  <span>19</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj20"
-              header-align="center"
-              align="center"
-              label="20">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('气液相管及其它管路')" placement="top">
-                  <span>20</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj21"
-              header-align="center"
-              align="center"
-              label="21">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('疏水、排放、排污装置')" placement="top">
-                  <span>21</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj22"
-              header-align="center"
-              align="center"
-              label="22">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('设备运行稳定情况')" placement="top">
-                  <span>22</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj23"
-              header-align="center"
-              align="center"
-              label="23">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('接地装置')" placement="top">
-                  <span>23</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj24"
-              header-align="center"
-              align="center"
-              label="24">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('安全状况等级为4级的压力容器的监控措施')" placement="top">
-                  <span>24</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column :label="$t('安全附件或设施')" header-align="center">
-            <el-table-column
-              prop="pj25"
-              header-align="center"
-              align="center"
-              label="25">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('安全阀')" placement="top">
-                  <span>25</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj26"
-              header-align="center"
-              align="center"
-              label="26">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('压力表')" placement="top">
-                  <span>26</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj27"
-              header-align="center"
-              align="center"
-              label="27">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('爆破片')" placement="top">
-                  <span>27</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj28"
-              header-align="center"
-              align="center"
-              label="28">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('测温仪表')" placement="top">
-                  <span>28</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj29"
-              header-align="center"
-              align="center"
-              label="29">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('液位计')" placement="top">
-                  <span>29</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj30"
-              header-align="center"
-              align="center"
-              label="30">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('快开门安全联锁装置')" placement="top">
-                  <span>30</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj31"
-              header-align="center"
-              align="center"
-              label="31">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('紧急切断装置')" placement="top">
-                  <span>31</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column :label="$t('其他')" header-align="center">
-            <el-table-column
-              prop="pj32"
-              header-align="center"
-              align="center"
-              label="32">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('装卸软管、装卸阀门')" placement="top">
-                  <span>32</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            prop="checkDate"
-            header-align="center"
-            align="center"
-            :label="$t('检查日期')">
-          </el-table-column>
-          <el-table-column
-            prop="problem"
-            header-align="center"
-            align="center"
-            :label="$t('问题及处理')">
-          </el-table-column>
-          <el-table-column
-            prop="con"
-            header-align="center"
-            align="center"
-            :label="$t('结论')"
-            :formatter="conFormat">
-          </el-table-column>
-          <el-table-column
-            prop="remarks"
-            header-align="center"
-            align="center"
-            :label="$t('备注')">
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.approveType == 7 && dataForm.devType == 2"
-          :data="devList"
-          border
-          style="width: 100%;">
-          <el-table-column
-            prop="devEntity.plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.unit"
-            header-align="center"
-            align="center"
-            :label="$t('单元')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.devname"
-            header-align="center"
-            align="center"
-            :label="$t('管道名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.devno"
-            header-align="center"
-            align="center"
-            :label="$t('管道编号')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.nextWarnDate"
-            header-align="center"
-            align="center"
-            :label="$t('下次定期检验日期')">
-          </el-table-column>
-          <el-table-column
-            prop="grade"
-            header-align="center"
-            align="center"
-            :label="$t('管道级别')">
-          </el-table-column>
-          <el-table-column
-            :label="$t('允许使用参数')"
-            align="center">
-            <el-table-column
-              prop="medium"
-              header-align="center"
-              align="center"
-              :label="$t('介质')">
-            </el-table-column>
-            <el-table-column
-              prop="desPressure"
-              header-align="center"
-              align="center"
-              :label="$t('设计压力')">
-            </el-table-column>
-            <el-table-column
-              prop="desTemp"
-              header-align="center"
-              align="center"
-              :label="$t('设计温度')">
-            </el-table-column>
-            <el-table-column
-              prop="optPressure"
-              header-align="center"
-              align="center"
-              :label="$t('操作压力')">
-            </el-table-column>
-            <el-table-column
-              prop="optTemp"
-              header-align="center"
-              align="center"
-              :label="$t('操作温度')">
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            prop="checkUnit"
-            header-align="center"
-            align="center"
-            :label="$t('检验单位')">
-          </el-table-column>
-          <el-table-column
-            prop="yearReportNo"
-            header-align="center"
-            align="center"
-            :label="$t('报告编号')">
-          </el-table-column>
-          <el-table-column
-            prop="safeClass"
-            header-align="center"
-            align="center"
-            :label="$t('安全等级')">
-          </el-table-column>
-          <el-table-column
-            prop="pj1"
-            header-align="center"
-            align="center"
-            label="1">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('安全管理情况')" placement="top">
-                <span>1</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj2"
-            header-align="center"
-            align="center"
-            label="2">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('设计图纸文档、维修记录、质量证明等资料')" placement="top">
-                <span>2</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj3"
-            header-align="center"
-            align="center"
-            label="3">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('作业人员定期培训情况')" placement="top">
-                <span>3</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj4"
-            header-align="center"
-            align="center"
-            label="4">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('管道本体及支架')" placement="top">
-                <span>4</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj5"
-            header-align="center"
-            align="center"
-            label="5">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('管道运行情况')" placement="top">
-                <span>5</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="安全附件及仪表"
-            align="center"
-          >
-            <el-table-column
-              prop="pj6"
-              header-align="center"
-              align="center"
-              label="6">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('安全阀')" placement="top">
-                  <span>6</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj7"
-              header-align="center"
-              align="center"
-              label="7">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('爆破片装置')" placement="top">
-                  <span>7</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj8"
-              header-align="center"
-              align="center"
-              label="8">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('阻火器装置')" placement="top">
-                  <span>8</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj9"
-              header-align="center"
-              align="center"
-              label="9">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('紧急切断阀')" placement="top">
-                  <span>9</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj10"
-              header-align="center"
-              align="center"
-              label="10">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('压力表')" placement="top">
-                  <span>10</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="pj11"
-              header-align="center"
-              align="center"
-              label="11">
-              <template slot-scope="scope" slot="header">
-                <el-tooltip effect="dark" :content="$t('测温仪表')" placement="top">
-                  <span>11</span>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            prop="pj12"
-            header-align="center"
-            align="center"
-            label="12">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('电阻值测量')" placement="top">
-                <span>12</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj13"
-            header-align="center"
-            align="center"
-            label="13">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('壁厚测定')" placement="top">
-                <span>13</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="checkDate"
-            header-align="center"
-            align="center"
-            :label="$t('检查日期')">
-          </el-table-column>
-          <el-table-column
-            prop="nextCheckDate"
-            header-align="center"
-            align="center"
-            :label="$t('下次年检时间')">
-          </el-table-column>
-          <el-table-column
-            prop="problem"
-            header-align="center"
-            align="center"
-            :label="$t('问题及处理')">
-          </el-table-column>
-          <el-table-column
-            prop="con"
-            header-align="center"
-            align="center"
-            :label="$t('结论')"
-            :formatter="conFormat">
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.approveType != 7 && dataForm.devType == 1"
-          :data="devList"
-          border
-          style="width: 100%; height: 95px">
-          <el-table-column
-            prop="plantCode"
-            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"
-            :show-overflow-tooltip="true"
-            width="150"
-            :label="$t('设备名称')">
-          </el-table-column>
-          <el-table-column
-            prop="useno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('使用证编号')">
-          </el-table-column>
-          <el-table-column
-            prop="medium"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('介质')">
-          </el-table-column>
-          <el-table-column
-            prop="desPressure"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('设计压力')+'(MPa)'">
-          </el-table-column>
-          <el-table-column
-            prop="desTemp"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('设计温度')+'(℃)'">
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.approveType != 7 && dataForm.devType == 2"
-          :data="devList"
-          border
-          style="width: 100%;  height: 95px">
-          <el-table-column
-            prop="plantCode"
-            header-align="center"
-            align="center"
-            width="100"
-            :label="$t('装置名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devno"
-            header-align="center"
-            align="center"
-            width="120"
-            :label="$t('位号')">
-          </el-table-column>
-          <el-table-column
-            prop="starting"
-            header-align="center"
-            align="center"
-            width="100"
-            :show-overflow-tooltip="true"
-            :label="$t('起点')">
-          </el-table-column>
-          <el-table-column
-            prop="ending"
-            header-align="center"
-            align="center"
-            width="100"
-            :show-overflow-tooltip="true"
-            :label="$t('终点')">
-          </el-table-column>
-          <el-table-column
-            prop="medium"
-            header-align="center"
-            align="center"
-            width="100"
-            :show-overflow-tooltip="true"
-            :label="$t('介质')">
-          </el-table-column>
-          <el-table-column
-            prop="desPressure"
-            header-align="center"
-            align="center"
-            :label="$t('设计压力')">
-          </el-table-column>
-          <el-table-column
-            prop="desTemp"
-            header-align="center"
-            align="center"
-            :label="$t('设计温度')">
-          </el-table-column>
-          <el-table-column
-            prop="optPressure"
-            header-align="center"
-            align="center"
-            :label="$t('工作压力')">
-          </el-table-column>
-          <el-table-column
-            prop="optTemp"
-            header-align="center"
-            align="center"
-            width="100"
-            :show-overflow-tooltip="true"
-            :label="$t('工作温度')">
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.devType == 3"
-          :data="devList"
-          border
-          style="width: 100%; height: 95px">
-          <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"
-            :show-overflow-tooltip="true"
-            :label="$t('档案号')">
-          </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="capacity"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('起吊重量')+'(ton)'">
-          </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 == 4"
-          :data="devList"
-          border
-          style="width: 100%; height: 95px">
-          <el-table-column
-            prop="plantCode"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('装置名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('位号')">
-          </el-table-column>
-          <el-table-column
-            prop="devname"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            width="120"
-            :label="$t('设备名称')">
-          </el-table-column>
-          <el-table-column
-            prop="useno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('使用证编号')">
-          </el-table-column>
-          <el-table-column
-            prop="desTemp"
-            header-align="center"
-            align="center"
-            :label="$t('设计温度')+'(℃)'">
-          </el-table-column>
-          <el-table-column
-            prop="desPressure"
-            header-align="center"
-            align="center"
-            :label="$t('设计压力')+'(MPa)'">
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="dataForm.devType == 5"
-          :data="devList"
-          border
-          style="width: 100%; height: 95px">
-          <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%; height: 95px">
-          <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%; height: 95px">
-          <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-button @click="recordHandle(devList,dataForm)" type="text" v-if="devList.length >1">{{$t('更多条目')}}</el-button>
-      </el-form-item>
+   
       <el-row>
-        <el-col :span="8" v-if="dataForm.approveType != 8">
-          <el-form-item :label="$t('设备类型')" prop="devType">
-            <el-select v-model="dataForm.devType" :placeholder="$t('message.select')" disabled>
-              <el-option
-                v-for="dict in devTypeOption"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="parseInt(dict.dictValue)">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+     
         <el-col :span="8">
           <el-form-item :label="$t('审批类型')" prop="approveType">
             <el-select v-model="dataForm.approveType" :placeholder="$t('message.select')" disabled>

ui/src/views/approve/approveDetail/kekao-resolve.vue

@@ -0,0 +1,670 @@
+<template>
+  <el-dialog
+    :title="!this.taskForm.taskId == '' ? $t('处理') : $t('详情')"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="taskForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="" label-width="80px">
+      <el-form-item :label="$t('设备')">
+        <el-table
+          v-show="dataForm.approveType != 7 && dataForm.devType == 1"
+          :data="devList"
+          border
+          style="width: 100%; height: 95px" >
+          <el-table-column
+            prop="plantCode"
+            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"
+            :show-overflow-tooltip="true"
+            width="150"
+            :label="$t('设备名称')">
+          </el-table-column>
+          <el-table-column
+            prop="useno"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('使用证编号')">
+          </el-table-column>
+          <el-table-column
+            prop="medium"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('介质')">
+          </el-table-column>
+          <el-table-column
+            prop="desPressure"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('设计压力')+'(MPa)'">
+          </el-table-column>
+          <el-table-column
+            prop="desTemp"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('设计温度')+'(℃)'">
+          </el-table-column>
+        </el-table>
+        <el-table
+          v-show="dataForm.approveType != 7 && dataForm.devType == 2"
+          :data="devList"
+          border
+          style="width: 100%; height: 95px">
+          <el-table-column
+            prop="plantCode"
+            header-align="center"
+            align="center"
+            width="100"
+            :label="$t('装置名称')">
+          </el-table-column>
+          <el-table-column
+            prop="devno"
+            header-align="center"
+            align="center"
+            width="120"
+            :label="$t('位号')">
+          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="starting"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="100"-->
+<!--            :show-overflow-tooltip="true"-->
+<!--            :label="$t('起点')">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="ending"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="100"-->
+<!--            :show-overflow-tooltip="true"-->
+<!--            :label="$t('终点')">-->
+<!--          </el-table-column>-->
+          <el-table-column
+            prop="medium"
+            header-align="center"
+            align="center"
+            width="100"
+            :show-overflow-tooltip="true"
+            :label="$t('介质')">
+          </el-table-column>
+          <el-table-column
+            prop="desPressure"
+            header-align="center"
+            align="center"
+            :label="$t('设计压力')">
+          </el-table-column>
+          <el-table-column
+            prop="desTemp"
+            header-align="center"
+            align="center"
+            :label="$t('设计温度')">
+          </el-table-column>
+          <el-table-column
+            prop="optPressure"
+            header-align="center"
+            align="center"
+            :label="$t('工作压力')">
+          </el-table-column>
+          <el-table-column
+            prop="optTemp"
+            header-align="center"
+            align="center"
+            width="100"
+            :show-overflow-tooltip="true"
+            :label="$t('工作温度')">
+          </el-table-column>
+        </el-table>
+        <el-table
+          v-show="dataForm.devType == 3"
+          :data="devList"
+          border
+          style="width: 100%; height: 95px">
+          <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"
+            :show-overflow-tooltip="true"
+            :label="$t('档案号')">
+          </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="capacity"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('起吊重量')+'(ton)'">
+          </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 == 4"
+          :data="devList"
+          border
+          style="width: 100%; height: 95px">
+          <el-table-column
+            prop="plantCode"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('装置名称')">
+          </el-table-column>
+          <el-table-column
+            prop="devno"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('位号')">
+          </el-table-column>
+          <el-table-column
+            prop="devname"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            width="120"
+            :label="$t('设备名称')">
+          </el-table-column>
+          <el-table-column
+            prop="useno"
+            header-align="center"
+            align="center"
+            :show-overflow-tooltip="true"
+            :label="$t('使用证编号')">
+          </el-table-column>
+          <el-table-column
+            prop="desTemp"
+            header-align="center"
+            align="center"
+            :label="$t('设计温度')+'(℃)'">
+          </el-table-column>
+          <el-table-column
+            prop="desPressure"
+            header-align="center"
+            align="center"
+            :label="$t('设计压力')+'(MPa)'">
+          </el-table-column>
+        </el-table>
+        <el-table
+          v-show="dataForm.devType == 5"
+          :data="devList"
+          border
+          style="width: 100%; height: 95px">
+          <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%; height: 95px">
+          <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%; height: 95px">
+          <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-button @click="recordHandle(devList,dataForm)" type="text" v-if="devList.length >1">{{$t('更多条目')}}</el-button>
+      </el-form-item>
+      <el-row>
+        <el-col :span="8" v-if="dataForm.approveType != 8">
+          <el-form-item :label="$t('设备类型')" prop="devType">
+            <el-select v-model="dataForm.devType" :placeholder="$t('message.select')" disabled>
+              <el-option
+                v-for="dict in devTypeOption"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('申请类型')" prop="approveType">
+            <el-select v-model="dataForm.approveType" :placeholder="$t('message.select')" disabled>
+              <el-option>
+                维修
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item :label="$t('申请时间')" prop="creattime">
+        <el-input v-model="dataForm.creattime" disabled></el-input>
+      </el-form-item>
+    </el-form>
+    <form ref="downloadForm" :action="downloadAction" target="FORMSUBMIT">
+      <input name="approveId" v-model="dataForm.id"  hidden  />
+      <input name="processId" v-model="dataForm.processId"  hidden  />
+    </form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-if="this.taskForm.taskId == ''" @click="visible = false">{{$t('message.return')}}</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''" type="primary" @click="dataFormSubmit(1)" :disabled="submitDisabled">{{$t('通过')}}</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''" type="danger" @click="dataFormSubmit(0)" :disabled="submitDisabled">{{$t('拒绝')}}</el-button>
+    </span>
+<!--    <div>-->
+<!--      <span>{{$t('流转详情')}}</span>-->
+<!--      <el-table :data="historyList" border v-loading="historyLoading" style="width: 100%;">-->
+<!--        <el-table-column prop="taskName" header-align="center" align="center" :label="$t('流程进度')"></el-table-column>-->
+<!--        <el-table-column prop="userName" header-align="center" align="center" :label="$t('姓名')"></el-table-column>-->
+<!--        <el-table-column prop="taskCreateTime" header-align="center" align="center" :label="$t('开始时间')"></el-table-column>-->
+<!--        <el-table-column prop="taskEndTime" header-align="center" align="center" :label="$t('结束时间')"></el-table-column>-->
+<!--        <el-table-column prop="comment" header-align="center" align="center" :label="$t('审批意见')"></el-table-column>-->
+<!--      </el-table>-->
+<!--    </div>-->
+    <record v-if="recordVisible" ref="recordDeal"></record>
+  </el-dialog>
+</template>
+
+<script>
+  import {getToken} from "@/utils/auth";
+  import {getHistorylist} from "@/api/ehs/approvedanger";
+  import {getApproveInfo, handleApprove} from "@/api/reliability/approve";
+  import record from "./spec-itemDetail";
+
+
+  export default {
+  name: "kekao-resolve",
+  components: {record},
+  data() {
+    return {
+      loading: true,
+      // 总条数
+      total: 0,
+      approvedangerList: [],
+      recordVisible: false,
+      // 遮罩层
+      historyLoading: false,
+      //显示详细列表
+      IfDataIndex: false,
+      //流转列表
+      historyList: [],
+      visible: false,
+      devList: [],
+      recordList: [],
+      dataList: [],
+      fileTips: '',
+      showDelay: false,
+      submitDisabled: false,
+      dataListLoading:true,
+      taskName: '',
+      dataForm: {
+        id: 0,
+        userId: '',
+        devId: '',
+        devType: '',
+        approveType: '',
+        content: '',
+        fileUrls: '',
+        reUrls: '',
+        status: '',
+        creattime: '',
+        plantCode: '',
+        unit: '',
+        devname: '',
+        devno: '',
+        files: [],
+        delayDate: '',
+        delayReason: '',
+        delayMeasure: '',
+        delayNotice: ''
+      },
+      taskForm: {
+        comment: '',
+        taskId: '',
+        files: '',
+        govDate: '',
+        govFileList: []
+      },
+      // 查询参数
+      queryParams: {
+        processId: null,
+      },
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        // 弹出层标题（报告附件）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/sems/specfile/uploadFile",
+        commonfileList: null,
+        pType: 'traning',
+        pId: null
+      },
+      dataRule: {
+        approveType: [
+          { required: true, message: this.$t('approveType') + this.$t('notEmpty'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('content') + this.$t('notEmpty'), trigger: 'blur' }
+        ]
+      },
+      downloadAction: process.env.VUE_APP_BASE_API +'/sems/approve/exportPDF',
+      approveOption: [],
+      devTypeOption: [{dictValue:1,dictLabel:'工业炉'},{dictValue:2,dictLabel:'压缩机'},{},{}],
+      belong: '',
+      fileList: [],
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    init (id, taskId, processId,taskName) {
+      this.getDicts("INTACT_APPROVE_TYPE").then(response => {
+        this.approveOption = response.data;
+      });
+      this.getDicts("INTACT_DEVTYPE").then(response => {
+        // this.devTypeOption = response.data;
+      });
+      this.dataForm.processId = processId
+      this.taskName = taskName
+      this.taskForm.taskId = taskId
+      this.dataForm.id = id || 0
+      this.visible = true
+      this.queryParams.processId = processId;
+      getHistorylist(this.queryParams).then(response => {
+        this.historyList = response.rows;
+        this.historyLoading = false
+      });
+      getApproveInfo(id).then(response => {
+        this.taskForm.businessKey = response.data.id
+        this.dataForm.userId = response.data.userId
+        this.dataForm.devId = response.data.devId
+        this.dataForm.devType = response.data.devType
+         this.dataForm.approveType = response.data.approveType
+
+        this.dataForm.content = response.data.content
+        this.dataForm.fileUrls = response.data.fileUrls
+        this.dataForm.reUrls = response.data.reUrls
+        this.dataForm.status = response.data.status
+        this.dataForm.creattime = response.data.creattime
+        this.dataForm.plantCode = response.data.plantCode
+        this.dataForm.unit = response.data.unit
+        this.dataForm.devname = response.data.devname
+        this.dataForm.devno = response.data.devno
+        this.dataForm.files = response.data.files
+        this.devList = response.data.devList
+        this.dataForm.delayDate = response.data.delayDate
+        this.dataForm.delayReason = response.data.delayReason
+        this.dataForm.delayMeasure = response.data.delayMeasure
+        this.dataForm.delayNotice = response.data.delayNotice
+      });
+
+    },
+    // 设备类型：字典翻译
+    devTypeFormat(row, column) {
+      // return this.selectDictLabel(this.devTypeOptions, row.devType);
+    },
+    // 审批类型字典翻译
+    approveTypeFormat(row, column) {
+      return this.selectDictLabel(this.approveTypeOptions, row.approveType);
+    },
+
+    // 取消按钮
+    cancel() {
+      this.visible = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        devId: null,
+        devType: null,
+        approveType: null,
+        content: null,
+        fileUrls: null,
+        reUrls: null,
+        status: 0,
+        creattime: null,
+        endtime: null,
+        processId: null,
+        govDate: null,
+        delayDate: null,
+        delayReason: null,
+        delayMeasure: null,
+        delayNotice: null,
+        apNo: null,
+        checkDate: null,
+        reportId: null,
+        monthId: null,
+        delFlag: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+
+    /** 提交按钮 */
+    // 表单提交
+    dataFormSubmit (val) {
+      this.submitDisabled = true
+      console.log(this.taskForm.govFileList)
+      this.dataForm.files = []
+      if (this.taskForm.govFileList.length > 0) {
+        for (let i = 0; i < this.taskForm.govFileList.length; i++) {
+          let obj = {}
+          obj.fileName = this.taskForm.govFileList[i].response.fileName
+          obj.fileUrl = this.taskForm.govFileList[i].response.url
+          this.dataForm.files.push(obj)
+        }
+      }
+      this.taskForm.condition = val
+      this.taskForm.govFiles = this.dataForm.files
+      handleApprove(this.taskForm).then(response => {
+        this.submitDisabled = false
+        this.msgSuccess(this.$t('处理成功'));
+        this.visible = false;
+        this.$emit('refreshDataList')
+      });
+      this.$nextTick(function () {
+        this.comment = ''
+      })
+    },
+    recordHandle(devList,dataForm){
+      this.recordVisible = true
+      this.$nextTick(() => {
+        this.$refs.recordDeal.init(devList,dataForm);
+      })
+    },
+}
+}
+
+
+</script>
+
+<style scoped>
+
+</style>

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

@@ -47,6 +47,7 @@
     <spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
     <intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>
+    <kekao-detail v-if="kekaoDetailVisible" ref="kekaoDetail" @refreshDataList="getList"></kekao-detail>
   </div>
 </template>
 
@@ -61,10 +62,11 @@
   import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
   import SpecMaintenance from '../approveDetail/specMaintenance-detail';
   import IntactDetail from '../approveDetail/intact-detail';
+  import KekaoDetail from "@/views/approve/approveDetail/kekao-detail";
 
   export default {
     name: "Myapprove",
-    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail},
+    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail},
     data() {
       return {
         // 遮罩层
@@ -75,6 +77,7 @@
         specTrainingPlanVisible: false,
         specMaintenanceVisible: false,
         intactDetailVisible:false,
+        kekaoDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -191,7 +194,13 @@
             console.log(row)
             this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
-        } else {
+        }else if (row.processName == "可靠性管理申请") {
+          this.kekaoDetailVisible = true
+          this.$nextTick(() => {
+            console.log(row.taskName)
+            this.$refs.kekaoDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
+        }  else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;
           this.infoprocessName = row.processName;

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

@@ -126,6 +126,7 @@
     <spec-training-plan v-if="specTrainingPlanDealVisible" ref="specTrainingPlanDeal" @refreshDataList="getList"></spec-training-plan>
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
     <intact-resolve v-if="intactResolveVisible" ref="intactResolveDeal" @refreshDataList="getList"></intact-resolve>
+    <kekao-resolve v-if="kekaoResolveVisible" ref="kekaoResolveDeal" @refreshDataList="getList"></kekao-resolve>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
   </div>
 </template>
@@ -143,6 +144,7 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import SpecMaintenance from "@/views/approve/pending/specMaintenance-deal";
+  import KekaoResolve from '../approveDetail/kekao-resolve';
 
   export default {
     name: "Pending",
@@ -154,7 +156,8 @@
       SpecTrainingPlan,
       ProcessImg,
       IntactResolve,
-      SpecMaintenance
+      SpecMaintenance,
+      KekaoResolve
     },
     data() {
       return {
@@ -167,6 +170,7 @@
         specModifyDealVisible: false,
         specTrainingPlanDealVisible: false,
         intactResolveVisible:false,
+        kekaoResolveVisible:false,
         specMaintenanceVisible: false,
         // 选中数组
         ids: [],
@@ -371,6 +375,14 @@
 
             this.$refs.intactResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
           })
+        }else if (row.processName == "可靠性管理申请"){
+          this.kekaoResolveVisible = true
+          this.$nextTick(() => {
+
+            console.log(row)
+
+            this.$refs.kekaoResolveDeal.init(row.approveObj.id, row.taskId, row.processId,row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;

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

@@ -56,6 +56,7 @@
     <spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
     <intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>
+    <kekao-detail v-if="kekaoDetailVisible" ref="kekaoDetail" @refreshDataList="getList"></kekao-detail>
   </div>
 </template>
 
@@ -71,10 +72,11 @@
   import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
   import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
   import IntactDetail from "@/views/approve/approveDetail/intact-detail";
+  import KekaoDetail from "@/views/approve/approveDetail/kekao-detail";
   export default {
     name: "Taskdone",
     components: {
-      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail
+      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail,KekaoDetail
     },
     data() {
       return {
@@ -86,6 +88,7 @@
         specTrainingPlanVisible: false,
         specMaintenanceVisible: false,
         intactDetailVisible:false,
+        kekaoDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -209,6 +212,12 @@
             console.log(row.taskName)
             this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
+        }else if (row.processName == "可靠性管理申请") {
+          this.kekaoDetailVisible = true
+          this.$nextTick(() => {
+            console.log(row.taskName)
+            this.$refs.kekaoDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;