PSSR审批功能异常处理

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

@@ -1220,7 +1220,11 @@ public class TPssrApproveController extends BaseController {
                 if (tPssrAirtightService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
                     return AjaxResult.error("请确认所有确认人都已选择！");
                 }
-                doQmApprove(tPssrSubcontent);
+                try {
+                    doQmApprove(tPssrSubcontent);
+                } catch (Exception e) {
+                    return AjaxResult.error(e.getMessage());
+                }
                 break;
             case "sksgfmzt"://锁开锁关阀门状态
                 if (tPssrLockService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
@@ -1244,7 +1248,11 @@ public class TPssrApproveController extends BaseController {
                 if (tPssrNitrogenService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
                     return AjaxResult.error("请确认所有确认人都已选择！");
                 }
-                doDqzhApprove(tPssrSubcontent);
+                try {
+                    doDqzhApprove(tPssrSubcontent);
+                } catch (Exception e) {
+                    return AjaxResult.error(e.getMessage());
+                }
                 break;
             case "xqf"://消气防设施
                 if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
@@ -1274,7 +1282,11 @@ public class TPssrApproveController extends BaseController {
                 if (tPssrPublicService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
                     return AjaxResult.error("请确认所有确认人都已选择！");
                 }
-                doGygcApprove(tPssrSubcontent);
+                try {
+                    doGygcApprove(tPssrSubcontent);
+                } catch (Exception e) {
+                    return AjaxResult.error(e.getMessage());
+                }
                 break;
             case "hbss"://环保设施
                 if (tPssrTorchvocService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
@@ -1375,17 +1387,20 @@ public class TPssrApproveController extends BaseController {
         } else if ("sbqjd".contains(sub.getForShort())) {
             forShorts.add("jb");
             forShorts.add("ybjy");
-        } else if ("jxxm,kgfa,sjbg".contains(sub.getForShort())) {
+        } else if ("jxxm,sjbg".contains(sub.getForShort())) {
             forShorts.add("sbqjd");
-        } else if ("mb".contains(sub.getForShort())) {
+        } else if ("kgfa".contains(sub.getForShort())) {
+            forShorts.add("sjbg");
             forShorts.add("jxxm");
+        } else if ("mb".contains(sub.getForShort())) {
             forShorts.add("kgfa");
-            forShorts.add("sjbg");
-        } else if ("dj,aqss,sksgfmzt".contains(sub.getForShort())) {
+        } else if ("dj,aqss,sksgfmzt,zdj,tzsb".contains(sub.getForShort())) {
             forShorts.add("mb");
         } else if ("xcws,rsfh,xqf,txjk,bxsjcy,hbss".contains(sub.getForShort())) {
             forShorts.add("dj");
             forShorts.add("aqss");
+            forShorts.add("zdj");
+            forShorts.add("tzsb");
             forShorts.add("sksgfmzt");
         } else if ("ssy,gygc,yfl".contains(sub.getForShort())) {
             forShorts.add("xcws");
@@ -1398,6 +1413,13 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("ssy");
             forShorts.add("gygc");
             forShorts.add("yfl");
+        }else if ("djsb".contains(sub.getForShort())) {
+            forShorts.add("qm");
+            forShorts.add("dqzh");
+        }else if ("yblscs".contains(sub.getForShort())) {
+            forShorts.add("djsb");
+        }else if ("bjlszqr,lsdy,zmdbr,jdjdkj,qtjcy,zxfxy".contains(sub.getForShort())) {
+            forShorts.add("yblscs");
         }
         if (CollectionUtils.isNotEmpty(forShorts)) {
             subcontent.setForShorts(forShorts);
@@ -2370,7 +2392,7 @@ public class TPssrApproveController extends BaseController {
      *
      * @param sub
      */
-    private void doDqzhApprove(TPssrSubcontent sub) {
+    private void doDqzhApprove(TPssrSubcontent sub) throws Exception {
         String userId = getUserId().toString();
         //修改状态
         TPssrNitrogen tPssrNitrogen = new TPssrNitrogen();
@@ -2378,7 +2400,13 @@ public class TPssrApproveController extends BaseController {
         tPssrNitrogen.setSubId(sub.getId());
         Set<String> confirm1 = new HashSet<>();
         Set<String> confirm2 = new HashSet<>();
-        for (TPssrNitrogen item : tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen)) {
+        List<TPssrNitrogen> tPssrNitrogens = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
+        for (TPssrNitrogen item : tPssrNitrogens) {
+            if(!"是".equals(item.getStandard())){
+                throw new Exception("氮气置换检查结果不符合要求，请重新填写！");
+            }
+        }
+        for (TPssrNitrogen item : tPssrNitrogens) {
             item.setApproveStatus(1L);
             item.setUpdatedate(new Date());
             item.setUpdaterCode(userId);
@@ -2922,7 +2950,7 @@ public class TPssrApproveController extends BaseController {
     }
 
     // 气密流程发起申请
-    public void doQmApprove(TPssrSubcontent sub) {
+    public void doQmApprove(TPssrSubcontent sub) throws Exception {
         String userId = getUserId().toString();
         //修改状态
         TPssrAirtight tPssrAirtight = new TPssrAirtight();
@@ -2930,7 +2958,13 @@ public class TPssrApproveController extends BaseController {
         tPssrAirtight.setSubId(sub.getId());
         Set<String> installer = new HashSet<>();
         Set<String> remover = new HashSet<>();
-        for (TPssrAirtight item : tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight)) {
+        List<TPssrAirtight> tPssrAirtights = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
+        for (TPssrAirtight item : tPssrAirtights) {
+            if(!"是".equals(item.getStandard())){
+                throw new Exception("气密性测试标准为否，请重新检查！");
+            }
+        }
+        for (TPssrAirtight item : tPssrAirtights) {
             item.setApproveStatus(1L);
             item.setUpdatedate(new Date());
             item.setUpdaterCode(userId);
@@ -3091,7 +3125,7 @@ public class TPssrApproveController extends BaseController {
     }
 
     // 公用工程流程发起申请
-    public void doGygcApprove(TPssrSubcontent sub) {
+    public void doGygcApprove(TPssrSubcontent sub) throws Exception {
         String userId = getUserId().toString();
         //修改状态
         TPssrPublic tPssrPublic = new TPssrPublic();
@@ -3099,7 +3133,13 @@ public class TPssrApproveController extends BaseController {
         tPssrPublic.setSubId(sub.getId());
         Set<String> installer = new HashSet<>();
         Set<String> remover = new HashSet<>();
-        for (TPssrPublic item : tPssrPublicService.selectTPssrPublicList(tPssrPublic)) {
+        List<TPssrPublic> tPssrPublics = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
+        for (TPssrPublic item : tPssrPublics) {
+            if("✔".equals(item.getCheckResult())){
+                throw new Exception("公用工程检查结果不合规！请重新检查！");
+            }
+        }
+        for (TPssrPublic item : tPssrPublics) {
             item.setApproveStatus(1L);
             item.setUpdatedate(new Date());
             item.setUpdaterCode(userId);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -289,25 +290,19 @@ public class TPssrNitrogenController extends BaseController {
         String dewPoint = tPssrNitrogen.getDewPoint();
         String dewPointValue = tPssrNitrogen.getDewPointValue();
         String standard = "";
-        if (!"".equals(oxygen) && !"".equals(dewPoint)) {//判断氧气+露点
+        if (StringUtils.isNotEmpty(oxygen) && StringUtils.isNotEmpty(dewPoint) && StringUtils.isNotEmpty(dewPointValue)) {//判断氧气+露点
             if (new BigDecimal(oxygen).compareTo(new BigDecimal(0.2)) == -1
                     && new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
                 standard = "是";
             } else {
                 standard = "否";
             }
-        } else if (!"".equals(oxygen) && "".equals(dewPoint)) {//判断氧气
+        } else if (StringUtils.isNotEmpty(oxygen)&&StringUtils.isEmpty(dewPoint) ) {//判断氧气
             if (new BigDecimal(oxygen).compareTo(new BigDecimal(0.2)) == -1) {
                 standard = "是";
             } else {
                 standard = "否";
             }
-        } else if (!"".equals(dewPoint) && "".equals(oxygen)) {//判断露点
-            if (new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
-                standard = "是";
-            } else {
-                standard = "否";
-            }
         }
         tPssrNitrogen.setStandard(standard);
     }

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

@@ -107,15 +107,6 @@ public class TPssrOverhaulExchanger extends BaseEntity
 
     private String reason;
     private String completionStatus;
-    private String pid;
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid;
-    }
 
     public String getCompletionStatus() {
         return completionStatus;

master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -25,10 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="completionStatus" column="completion_status" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulExchangerVo">
-        select d.dev_type,d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
+        select d.completion_status,d.dev_type,d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
@@ -135,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="completionStatus != null">completion_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -155,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="completionStatus != null">#{completionStatus},</if>
          </trim>
     </insert>
 
@@ -178,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="completionStatus" column="completion_status" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulFilterVo">
-        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
+        select d.completion_status,d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.resp_person
     </sql>
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or iso_dwg_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
@@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="completionStatus != null">completion_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="completionStatus != null">#{completionStatus},</if>
          </trim>
     </insert>
 
@@ -156,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="completionStatus" column="completion_status" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulTowerVo">
-        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_tower d
+        select d.completion_status,d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_tower d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.CONFIRMED_PERSON
     </sql>
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
@@ -90,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="completionStatus != null">completion_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="completionStatus != null">#{completionStatus},</if>
          </trim>
     </insert>
 
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -35,10 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
+        <result property="completionStatus" column="completion_status" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulValveVo">
-        select d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_valve d
+        select d.completion_status,d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.change_type, d.connection_form, d.itp, d.construction_team, d.item, d.plant, d.valve_position, d.vavle_info_des, d.type, d.pipe_size, d.valve_class, d.quantity_required, d.fault_common, d.medium, d.pid_no, d.done_date, d.identifying_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_valve d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.identifying_person
     </sql>
@@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
@@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="completionStatus != null">completion_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -153,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="completionStatus != null">#{completionStatus},</if>
          </trim>
     </insert>
 
@@ -196,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="completionStatus != null">completion_status = #{completionStatus},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -167,7 +167,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>{{devName}}检修清单</H2>
+      <H2>{{devName}}检修清单</H2><br>
+      <span>检查确认检修项目是否已经完成，检修项目已经完成的在“完成状态”栏中打”✔“，未完成的打“×。</span><br>
+      <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的，请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -180,13 +182,14 @@
       </el-table-column>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
+      <el-table-column label="PI&D图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
-      <el-table-column label="图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="完成时间" align="center" prop="completionDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -244,6 +247,12 @@
         <el-form-item label="图号" prop="pidNo">
           <el-input v-model="form.pidNo" placeholder="请输入图号"/>
         </el-form-item>
+        <el-form-item label="完成状态" prop="completionStatus">
+          <el-radio-group v-model="form.completionStatus">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="确认人" prop="confirmedPerson">
           <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -700,6 +709,7 @@ export default {
         subId: this.subId,
         approveId: null,
         devType: this.devType,
+        completionStatus: null,
         tagNo: null,
         equipmentName: null,
         workDes: null,

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

@@ -150,7 +150,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>过滤器清洗工作清单</H2>
+      <H2>过滤器清洗工作清单</H2><br>
+      <span>检查确认检修项目是否已经完成，检修项目已经完成的在“完成状态”栏中打”✔“，未完成的打“×。</span><br>
+      <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的，请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulFilterList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -172,6 +174,7 @@
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="负责人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -238,6 +241,12 @@
         <el-form-item label="QTY数量" prop="qtyNum">
           <el-input v-model="form.qtyNum" placeholder="请输入QTY数量"/>
         </el-form-item>
+        <el-form-item label="完成状态" prop="completionStatus">
+          <el-radio-group v-model="form.completionStatus">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="负责人" prop="respPerson">
           <el-select v-model="form.respPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -589,24 +598,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        plant: [
-          {required: true, message: "区域不得为空", trigger: "blur"}
-        ],
-        strainerLocation: [
-          {required: true, message: "过滤网位置不得为空", trigger: "blur"}
-        ],
-        pidNo: [
-          {required: true, message: "图号不得为空", trigger: "blur"}
-        ],
-        isoDwgNo: [
-          {required: true, message: "管线号不得为空", trigger: "blur"}
-        ],
-        flangeSize: [
-          {required: true, message: "法兰尺寸不得为空", trigger: "blur"}
-        ],
-        qtyNum: [
-          {required: true, message: "QTY数量不得为空", trigger: "blur"}
-        ],
         respPerson: [{required: true, message: "负责人不可为空", trigger: "blur"}],
       }
     };
@@ -691,6 +682,7 @@ export default {
         isoDwgNo: null,
         flangeSize: null,
         qtyNum: null,
+        completionStatus: null,
         completionDate: null,
         respPerson: null,
         delFlag: null,

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

@@ -168,7 +168,9 @@
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>塔罐检修清单</H2>
+      <H2>塔罐检修清单</H2><br>
+      <span>检查确认检修项目是否已经完成，检修项目已经完成的在“完成状态”栏中打”✔“，未完成的打“×。</span><br>
+      <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的，请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulTowerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -181,12 +183,13 @@
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
-      <el-table-column label="图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
+      <el-table-column label="PI&D图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="完成时间" align="center" prop="completionDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -244,6 +247,12 @@
         <el-form-item label="图号" prop="pidNo">
           <el-input v-model="form.pidNo" placeholder="请输入图号"/>
         </el-form-item>
+        <el-form-item label="完成状态" prop="completionStatus">
+          <el-radio-group v-model="form.completionStatus">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="确认人" prop="confirmedPerson">
           <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -674,6 +683,7 @@ export default {
         id: null,
         subId: this.subId,
         approveId: null,
+        completionStatus: null,
         tagNo: null,
         equipmentName: null,
         workDes: null,

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

@@ -142,7 +142,9 @@
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>阀门更换、下线维修清单</H2>
+      <H2>阀门更换、下线维修清单</H2><br>
+      <span>检查确认检修项目是否已经完成，检修项目已经完成的在“完成状态”栏中打”✔“，未完成的打“×。</span><br>
+      <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的，请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulValveList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -166,6 +168,7 @@
           <span>{{ parseTime(scope.row.doneDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
                        width="180"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
@@ -240,6 +243,12 @@
             <el-option label="维修" value="维修"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="完成状态" prop="completionStatus">
+          <el-radio-group v-model="form.completionStatus">
+            <el-radio label="✔">✔</el-radio>
+            <el-radio label="✖">✖</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="确认人" prop="identifyingPerson">
           <el-select v-model="form.identifyingPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -695,6 +704,7 @@ export default {
         pidNo: null,
         doneDate: null,
         identifyingPerson: null,
+        completionStatus: null,
         delFlag: null,
         createrCode: null,
         createdate: null,

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

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