限制空间C、E栏

master/src/main/java/com/ruoyi/project/ticket/controller/TRestrictedSpacePermitController.java

@@ -12,7 +12,9 @@ import com.deepoove.poi.data.style.Style;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.project.common.controller.WordController;
+import com.ruoyi.project.configuration.domain.TMatter;
 import com.ruoyi.project.configuration.mapper.TMatterMapper;
+import com.ruoyi.project.configuration.service.ITMatterProtectService;
 import com.ruoyi.project.ticket.domain.PermitRelation;
 import com.ruoyi.project.ticket.domain.TRestrictedSpacePermit;
 import com.ruoyi.project.ticket.domain.TTicketId;
@@ -61,6 +63,9 @@ public class TRestrictedSpacePermitController extends BaseController
     @Autowired
     private WordController wordController;
 
+    @Autowired
+    private ITMatterProtectService matterProtectService;
+
     /**
      * 查询限制性空间进入开票列表
      */
@@ -170,6 +175,7 @@ public class TRestrictedSpacePermitController extends BaseController
         Map<String, Object> params = new HashMap<>();
         // 渲染文本
         params.put("cId", Texts.of(tRestrictedSpacePermit.getcId().toString()).fontSize(7).bold().create());
+        // A栏
         params.put("aEquipmentName", Texts.of(tRestrictedSpacePermit.getaEquipmentName()).fontSize(7).bold().create());
         params.put("aEquipmentLeader", Texts.of(tRestrictedSpacePermit.getaEquipmentLeader()).fontSize(7).bold().create());
         params.put("aEquipmentTel", Texts.of(tRestrictedSpacePermit.getaEquipmentTel()).fontSize(7).bold().create());
@@ -182,13 +188,12 @@ public class TRestrictedSpacePermitController extends BaseController
         params.put("aContractorLeader", Texts.of(tRestrictedSpacePermit.getaContractorLeader()).fontSize(7).bold().create());
         params.put("aContractorTel", Texts.of(tRestrictedSpacePermit.getaContractorTel()).fontSize(7).bold().create());
         params.put("aContractorOffice", Texts.of(tRestrictedSpacePermit.getaContractorOffice()).fontSize(7).bold().create());
-
         getCheck(params, tRestrictedSpacePermit.getaIsNeedSafeLiaison().toString(), "aIsNSL1", "aIsNSL2");
         params.put("aSafeLiaisonName", Texts.of(tRestrictedSpacePermit.getaSafeLiaisonName()).fontSize(7).bold().create());
         params.put("aSafeLiaisonSign", Texts.of(tRestrictedSpacePermit.getaSafeLiaisonSign()).fontSize(7).bold().create());
         params.put("aSafeLiaisonTel", Texts.of(tRestrictedSpacePermit.getaSafeLiaisonTel()).fontSize(7).bold().create());
         params.put("aSafeLiaisonOffice", Texts.of(tRestrictedSpacePermit.getaSafeLiaisonOffice()).fontSize(7).bold().create());
-        // B 栏
+        // B栏
         params.put("bDeviceName", Texts.of(tRestrictedSpacePermit.getbDeviceName()).fontSize(7).bold().create());
         params.put("bAreaNo", Texts.of(tRestrictedSpacePermit.getbAreaNo()).fontSize(7).bold().create());
         params.put("bWorkContent", Texts.of(tRestrictedSpacePermit.getbWorkContent()).fontSize(7).bold().create());
@@ -198,6 +203,89 @@ public class TRestrictedSpacePermitController extends BaseController
         if (tRestrictedSpacePermit.getbValidityEndTime() != null) {
             params.put("bValidityEndTime", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日HH时mm分", tRestrictedSpacePermit.getbValidityEndTime())).fontSize(7).bold().create());
         }
+        // C 栏
+        getCheck(params, tRestrictedSpacePermit.getcIsYesDanger(), "cIsYesDanger");
+        List<TMatter> tMatters = tMatterMapper.selectTMatterList(new TMatter());
+        for (TMatter t : tMatters
+        ) {
+            if (t.getId().toString().equals(tRestrictedSpacePermit.getcHarmMatterName())) {
+                params.put("cHarmMatterName", Texts.of(t.getMatterName()).fontSize(7).bold().create());
+            }
+        }
+        getCheck(params, tRestrictedSpacePermit.getcIsGhs(), "cIsGhs");
+        getCheck(params, tRestrictedSpacePermit.getcIsToxic(), "cIsToxic");
+        getCheck(params, tRestrictedSpacePermit.getcIsFlammable(), "cIsFlammable");
+        getCheck(params, tRestrictedSpacePermit.getcIsOxidizing(), "cIsOxidizing");
+        getCheck(params, tRestrictedSpacePermit.getcIsExplosive(), "cIsExplosive");
+        getCheck(params, tRestrictedSpacePermit.getcIsCorrosive(), "cIsCorrosive");
+        getCheck(params, tRestrictedSpacePermit.getcIsIrritantToxic(), "cIsIrritantToxic");
+        getCheck(params, tRestrictedSpacePermit.getcIsHealthHazard(), "cIsHealthHazard");
+        getCheck(params, tRestrictedSpacePermit.getcIsCompressedGas(), "cIsCompressedGas");
+        getCheck(params, tRestrictedSpacePermit.getcIsEnvironmentalHazard(), "cIsEnvironmentalHazard");
+        //设备内物质处于危险状态（{{cIsHighTemp}}高温/{{cIsLowTemp}}低温；{{cIsPosPressure}}正压/{{cIsNegPressure}}负压
+        getCheck(params, tRestrictedSpacePermit.getcIsHighTemp(), "cIsHighTemp");
+        getCheck(params, tRestrictedSpacePermit.getcIsLowTemp(), "cIsLowTemp");
+        getCheck(params, tRestrictedSpacePermit.getcIsPosPressure(), "cIsPosPressure");
+        getCheck(params, tRestrictedSpacePermit.getcIsNegPressure(), "cIsNegPressure");
+        if ("1".equals(tRestrictedSpacePermit.getcIsHighTemp()) || "1".equals(tRestrictedSpacePermit.getcIsLowTemp()) || "1".equals(tRestrictedSpacePermit.getcIsPosPressure()) || "1".equals(tRestrictedSpacePermit.getcIsHighTemp())) {
+            getCheck(params, "1", "isFacilityHazards");
+        } else {
+            getCheck(params, "2", "isFacilityHazards");
+        }
+        //来自设备/设施的危害（{{cIsMovingParts}}移动部件，{{cIsHotSurfaces}}热表面/ {{cIsColdSurfaces}}冷表面，{{cIsVoltages}}电压）
+        getCheck(params, tRestrictedSpacePermit.getcIsMovingParts(), "cIsMovingParts");
+        getCheck(params, tRestrictedSpacePermit.getcIsHotSurfaces(), "cIsHotSurfaces");
+        getCheck(params, tRestrictedSpacePermit.getcIsColdSurfaces(), "cIsColdSurfaces");
+        getCheck(params, tRestrictedSpacePermit.getcIsVoltages(), "cIsVoltages");
+        if ("1".equals(tRestrictedSpacePermit.getcIsMovingParts()) || "1".equals(tRestrictedSpacePermit.getcIsHotSurfaces()) || "1".equals(tRestrictedSpacePermit.getcIsColdSurfaces()) || "1".equals(tRestrictedSpacePermit.getcIsVoltages())) {
+            getCheck(params, "1", "isEquipmentHazards");
+        } else {
+            getCheck(params, "2", "isEquipmentHazards");
+        }
+        //{{cIsOtherDanger}} 其它危害：{{cOtherDangerContent}}
+        getCheck(params, tRestrictedSpacePermit.getcIsOtherDanger(), "cIsOtherDanger");
+        params.put("cOtherDangerContent", Texts.of(tRestrictedSpacePermit.getcOtherDangerContent()).fontSize(7).bold().create());
+        //{{cIsHazardsProd}}	施工对生产单位的危害：{{cIsHazardsProdContent}}
+        getCheck(params, tRestrictedSpacePermit.getcIsHazardsProd(), "cIsHazardsProd");
+        params.put("cIsHazardsProdContent", Texts.of(tRestrictedSpacePermit.getcIsHazardsProdContent()).fontSize(7).bold().create());
+        //E 栏
+        //1.是否可能有残留物料
+        getCheck(params, tRestrictedSpacePermit.geteIsPresent(), "eIsPresent", "eIsPresent2");
+        getCheck(params, tRestrictedSpacePermit.geteIsRequiredPpe(), "eIsRequiredPpe", "eIsRequiredPpe2");
+        //2.项目内容"
+        params.put("ePpeContent", Texts.of(tRestrictedSpacePermit.getePpeContent()).fontSize(7).bold().create());
+        params.put("ePpeContent2", Texts.of(tRestrictedSpacePermit.getePpeContent2()).fontSize(7).bold().create());
+        getCheck(params, tRestrictedSpacePermit.geteIsSafeGoggles(), "eIsSafeGoggles", "eIsSafeGoggles2");
+        getCheck(params, tRestrictedSpacePermit.geteIsFaceShield(), "eIsFaceShield", "eIsFaceShield2");
+        getCheck(params, tRestrictedSpacePermit.geteIsProtectGloves(), "eIsProtectGloves", "eIsProtectGloves2");
+        params.put("eProtectGlovesContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteProtectGlovesContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
+        getCheck(params, tRestrictedSpacePermit.geteIsRubberBoots(), "eIsRubberBoots", "eIsRubberBoots2");
+        getCheck(params, tRestrictedSpacePermit.geteIsRubberApron(), "eIsRubberApron", "eIsRubberApron2");
+        getCheck(params, tRestrictedSpacePermit.geteIsProtectSuit(), "eIsProtectSuit", "eIsProtectSuit2");
+        params.put("eProtectSuitContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteProtectSuitContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
+        //2.7是否呼吸保护用品
+        getCheck(params, tRestrictedSpacePermit.geteIsResProtect(), "eIsResProtect", "eIsResProtect2");
+        params.put("eResProtectContent", Texts.of(matterProtectService.selectTMatterProtectById(Long.parseLong(tRestrictedSpacePermit.geteResProtectContent())).getConservatoryMeasureName()).fontSize(7).bold().create());
+        getCheck(params, tRestrictedSpacePermit.geteIsFallArrest(), "eIsFallArrest", "eIsFallArrest2");
+        params.put("eFallArrestContent", Texts.of(tRestrictedSpacePermit.geteFallArrestContent()).fontSize(7).bold().create());
+        //2.9
+        getCheck(params, tRestrictedSpacePermit.geteIsOtherProtect(), "eIsOtherProtect", "eIsOtherProtect2");
+        params.put("eOtherProtectContent", Texts.of(tRestrictedSpacePermit.geteOtherProtectContent()).fontSize(7).bold().create());
+        //3.是否连续监控
+        getCheck(params, tRestrictedSpacePermit.geteIsContinueMonitoring(), "eIsContinueMonitoring", "eIsContinueMonitoring2");
+        params.put("eMonitor", Texts.of(tRestrictedSpacePermit.geteMonitor()).fontSize(7).bold().create());
+        params.put("eSafeAttendant", Texts.of(tRestrictedSpacePermit.geteSafeAttendant()).fontSize(7).bold().create());
+        //4.通风措施
+        params.put("eNaturalVenContent", Texts.of(tRestrictedSpacePermit.geteNaturalVenContent()).fontSize(7).bold().create());
+        params.put("eMecVenContent", Texts.of(tRestrictedSpacePermit.geteMecVenContent()).fontSize(7).bold().create());
+        params.put("eAnalyzeAirContent", Texts.of(tRestrictedSpacePermit.geteAnalyzeAirContent()).fontSize(7).bold().create());
+        params.put("eAnalyzeAirInterval", Texts.of(tRestrictedSpacePermit.geteAnalyzeAirInterval()).fontSize(7).bold().create());
+        params.put("eOtherVenContent", Texts.of(tRestrictedSpacePermit.geteOtherVenContent()).fontSize(7).bold().create());
+        getCheck(params, tRestrictedSpacePermit.geteIsNaturalVen(), "eIsNaturalVen", "eIsNaturalVen2");
+        getCheck(params, tRestrictedSpacePermit.geteIsMecVen(), "eIsMecVen", "eIsMecVen2");
+        getCheck(params, tRestrictedSpacePermit.geteIsExxtractDust(), "eIsExxtractDust", "eIsExxtractDust2");
+        getCheck(params, tRestrictedSpacePermit.geteIsAnalyzeAir(), "eIsAnalyzeAir", "eIsAnalyzeAir2");
+        getCheck(params, tRestrictedSpacePermit.geteIsOtherVen(), "eIsOtherVen", "eIsOtherVen2");
         return params;
     }
 

master/src/main/java/com/ruoyi/project/ticket/domain/TRestrictedSpacePermit.java

@@ -106,81 +106,101 @@ public class TRestrictedSpacePermit extends BaseEntity
     @Excel(name = "有效期，结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date bValidityEndTime;
 
+    /** C 是否有GHS标识 */
+    @Excel(name = "是否有GHS标识")
+    private String cIsGhs;
+
+    /** C 是否危害物质 */
+    @Excel(name = "是否危害物质")
+    private String cIsYesDanger;
+
+    /** C 是否设备内物质处于危险状态 */
+    @Excel(name = "是否设备内物质处于危险状态")
+    private String isEquipmentHazards;
+
+    /** C 是否来自设备/设施的危害 */
+    @Excel(name = "是否来自设备/设施的危害")
+    private String isFacilityHazards;
+
+    /** C 是否涉及的其它作业，相关许可证 */
+    @Excel(name = "是否涉及的其它作业，相关许可证")
+    private String cIsOtherA;
+
     /** 危害物质名称 */
     @Excel(name = "危害物质名称")
     private String cHarmMatterName;
 
     /** 是否毒性 */
     @Excel(name = "是否毒性")
-    private Long cIsToxic;
+    private String cIsToxic;
 
     /** 是否易燃性 */
     @Excel(name = "是否易燃性")
-    private Long cIsFlammable;
+    private String cIsFlammable;
 
     /** 是否氧化性 */
     @Excel(name = "是否氧化性")
-    private Long cIsOxidizing;
+    private String cIsOxidizing;
 
     /** 是否爆炸性 */
     @Excel(name = "是否爆炸性")
-    private Long cIsExplosive;
+    private String cIsExplosive;
 
     /** 是否腐蚀性 */
     @Excel(name = "是否腐蚀性")
-    private Long cIsCorrosive;
+    private String cIsCorrosive;
 
     /** 是否刺激性/致命性/毒性 */
     @Excel(name = "是否刺激性/致命性/毒性")
-    private Long cIsIrritantToxic;
+    private String cIsIrritantToxic;
 
     /** 是否健康危害 */
     @Excel(name = "是否健康危害")
-    private Long cIsHealthHazard;
+    private String cIsHealthHazard;
 
     /** 是否压力下气体 */
     @Excel(name = "是否压力下气体")
-    private Long cIsCompressedGas;
+    private String cIsCompressedGas;
 
     /** 是否危害水生环境 */
     @Excel(name = "是否危害水生环境")
-    private Long cIsEnvironmentalHazard;
+    private String cIsEnvironmentalHazard;
 
     /** 是否高温 */
     @Excel(name = "是否高温")
-    private Long cIsHighTemp;
+    private String cIsHighTemp;
 
     /** 是否低温 */
     @Excel(name = "是否低温")
-    private Long cIsLowTemp;
+    private String cIsLowTemp;
 
     /** 是否正压 */
     @Excel(name = "是否正压")
-    private Long cIsPosPressure;
+    private String cIsPosPressure;
 
     /** 是否负压 */
     @Excel(name = "是否负压")
-    private Long cIsNegPressure;
+    private String cIsNegPressure;
 
     /** 是否移动部件 */
     @Excel(name = "是否移动部件")
-    private Long cIsMovingParts;
+    private String cIsMovingParts;
 
     /** 是否热表面 */
     @Excel(name = "是否热表面")
-    private Long cIsHotSurfaces;
+    private String cIsHotSurfaces;
 
     /** 是否冷表面 */
     @Excel(name = "是否冷表面")
-    private Long cIsColdSurfaces;
+    private String cIsColdSurfaces;
 
     /** 是否电压 */
     @Excel(name = "是否电压")
-    private Long cIsVoltages;
+    private String cIsVoltages;
 
     /** 是否其他危害 */
     @Excel(name = "是否其他危害")
-    private Long cIsOtherDanger;
+    private String cIsOtherDanger;
 
     /** 其他危害内容 */
     @Excel(name = "其他危害内容")
@@ -188,7 +208,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 是否施工对生产单位的危害 */
     @Excel(name = "是否施工对生产单位的危害")
-    private Long cIsHazardsProd;
+    private String cIsHazardsProd;
 
     /** 施工对生产单位的危害内容 */
     @Excel(name = "施工对生产单位的危害内容")
@@ -795,27 +815,31 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 1.是否可能有残留物料 */
     @Excel(name = "1.是否可能有残留物料")
-    private Long eIsPresent;
+    private String eIsPresent;
 
     /** 2.是否仅限定时间内佩戴PPE */
     @Excel(name = "2.是否仅限定时间内佩戴PPE")
-    private Long eIsRequiredPpe;
+    private String eIsRequiredPpe;
 
     /** 2.项目内容 */
     @Excel(name = "2.项目内容")
     private String ePpeContent;
 
+    /** 2.项目内容2 */
+    @Excel(name = "2.项目内容2")
+    private String ePpeContent2;
+
     /** 2.1是否安全护目镜 */
     @Excel(name = "2.1是否安全护目镜")
-    private Long eIsSafeGoggles;
+    private String eIsSafeGoggles;
 
     /** 2.2是否防护面罩 */
     @Excel(name = "2.2是否防护面罩")
-    private Long eIsFaceShield;
+    private String eIsFaceShield;
 
     /** 2.3是否防护手套 */
     @Excel(name = "2.3是否防护手套")
-    private Long eIsProtectGloves;
+    private String eIsProtectGloves;
 
     /** 2.3防护手套类型 */
     @Excel(name = "2.3防护手套类型")
@@ -823,19 +847,23 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 2.4是否橡胶长靴 */
     @Excel(name = "2.4是否橡胶长靴")
-    private Long eIsRubberBoots;
+    private String eIsRubberBoots;
 
     /** 3.是否连续监控 */
     @Excel(name = "3.是否连续监控")
     private String eIsContinueMonitoring;
 
+    /** 3.观察员，提供单位 */
+    @Excel(name = "3.观察员，提供单位")
+    private String eMonitor;
+
     /** 2.5是否橡胶围裙 */
     @Excel(name = "2.5是否橡胶围裙")
-    private Long eIsRubberApron;
+    private String eIsRubberApron;
 
     /** 2.6是否防护服 */
     @Excel(name = "2.6是否防护服")
-    private Long eIsProtectSuit;
+    private String eIsProtectSuit;
 
     /** 3.安全监护人签名 */
     @Excel(name = "3.安全监护人签名")
@@ -847,7 +875,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 2.7是否呼吸保护用品 */
     @Excel(name = "2.7是否呼吸保护用品")
-    private Long eIsResProtect;
+    private String eIsResProtect;
 
     /** 2.7呼吸保护用品类型 */
     @Excel(name = "2.7呼吸保护用品类型")
@@ -855,7 +883,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 2.8是否防坠落装置 */
     @Excel(name = "2.8是否防坠落装置")
-    private Long eIsFallArrest;
+    private String eIsFallArrest;
 
     /** 2.8防坠落装置类型 */
     @Excel(name = "2.8防坠落装置类型")
@@ -863,7 +891,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 2.9是否其他个人防护用品 */
     @Excel(name = "2.9是否其他个人防护用品")
-    private Long eIsOtherProtect;
+    private String eIsOtherProtect;
 
     /** 2.9其他个人防护用品内容 */
     @Excel(name = "2.9其他个人防护用品内容")
@@ -875,7 +903,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 4.1是否自然通风 */
     @Excel(name = "4.1是否自然通风")
-    private Long eIsNaturalVen;
+    private String eIsNaturalVen;
 
     /** 4.1自然通风内容 */
     @Excel(name = "4.1自然通风内容")
@@ -883,7 +911,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 4.2是否机械通风 */
     @Excel(name = "4.2是否机械通风")
-    private Long eIsMecVen;
+    private String eIsMecVen;
 
     /** 4.2机械通风使用内容 */
     @Excel(name = "4.2机械通风使用内容")
@@ -891,11 +919,11 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 4.3是否在释放源处抽走粉尘/气体/蒸汽 */
     @Excel(name = "4.3是否在释放源处抽走粉尘/气体/蒸汽")
-    private Long eIsExxtractDust;
+    private String eIsExxtractDust;
 
     /** 4.4是否空气分析 */
     @Excel(name = "4.4是否空气分析")
-    private Long eIsAnalyzeAir;
+    private String eIsAnalyzeAir;
 
     /** 4.4空气分析内容 */
     @Excel(name = "4.4空气分析内容")
@@ -907,7 +935,7 @@ public class TRestrictedSpacePermit extends BaseEntity
 
     /** 4.5是否其他通风措施 */
     @Excel(name = "4.5是否其他通风措施")
-    private Long eIsOtherVen;
+    private String eIsOtherVen;
 
     /** 4.5其他通风措施内容 */
     @Excel(name = "4.5其他通风措施内容")
@@ -999,10 +1027,6 @@ public class TRestrictedSpacePermit extends BaseEntity
     @Excel(name = "J1 授权的维修工人签名", readConverterExp = "I=1b")
     private String jOneBSign;
 
-    /** 是否有GHS标识 */
-    @Excel(name = "是否有GHS标识")
-    private String cIsGhs;
-
     /** J1 授权的维修工人签名（I1b）时间 */
     @Excel(name = "J1 授权的维修工人签名", readConverterExp = "I=1b")
     private Date jOneBDate;
@@ -1066,6 +1090,14 @@ public class TRestrictedSpacePermit extends BaseEntity
     @Excel(name = "M 其他相关许可证3")
     private Long mOtherLicenceThree;
 
+    public String getcIsYesDanger() {
+        return cIsYesDanger;
+    }
+
+    public void setcIsYesDanger(String cIsYesDanger) {
+        this.cIsYesDanger = cIsYesDanger;
+    }
+
     public void setcId(Long cId)
     {
         this.cId = cId;
@@ -1273,186 +1305,167 @@ public class TRestrictedSpacePermit extends BaseEntity
     {
         return cHarmMatterName;
     }
-    public void setcIsToxic(Long cIsToxic)
-    {
-        this.cIsToxic = cIsToxic;
-    }
 
-    public Long getcIsToxic()
-    {
+    public String getcIsToxic() {
         return cIsToxic;
     }
-    public void setcIsFlammable(Long cIsFlammable)
-    {
-        this.cIsFlammable = cIsFlammable;
+
+    public void setcIsToxic(String cIsToxic) {
+        this.cIsToxic = cIsToxic;
     }
 
-    public Long getcIsFlammable()
-    {
+    public String getcIsFlammable() {
         return cIsFlammable;
     }
-    public void setcIsOxidizing(Long cIsOxidizing)
-    {
-        this.cIsOxidizing = cIsOxidizing;
+
+    public void setcIsFlammable(String cIsFlammable) {
+        this.cIsFlammable = cIsFlammable;
     }
 
-    public Long getcIsOxidizing()
-    {
+    public String getcIsOxidizing() {
         return cIsOxidizing;
     }
-    public void setcIsExplosive(Long cIsExplosive)
-    {
-        this.cIsExplosive = cIsExplosive;
+
+    public void setcIsOxidizing(String cIsOxidizing) {
+        this.cIsOxidizing = cIsOxidizing;
     }
 
-    public Long getcIsExplosive()
-    {
+    public String getcIsExplosive() {
         return cIsExplosive;
     }
-    public void setcIsCorrosive(Long cIsCorrosive)
-    {
-        this.cIsCorrosive = cIsCorrosive;
+
+    public void setcIsExplosive(String cIsExplosive) {
+        this.cIsExplosive = cIsExplosive;
     }
 
-    public Long getcIsCorrosive()
-    {
+    public String getcIsCorrosive() {
         return cIsCorrosive;
     }
-    public void setcIsIrritantToxic(Long cIsIrritantToxic)
-    {
-        this.cIsIrritantToxic = cIsIrritantToxic;
+
+    public void setcIsCorrosive(String cIsCorrosive) {
+        this.cIsCorrosive = cIsCorrosive;
     }
 
-    public Long getcIsIrritantToxic()
-    {
+    public String getcIsIrritantToxic() {
         return cIsIrritantToxic;
     }
-    public void setcIsHealthHazard(Long cIsHealthHazard)
-    {
-        this.cIsHealthHazard = cIsHealthHazard;
+
+    public void setcIsIrritantToxic(String cIsIrritantToxic) {
+        this.cIsIrritantToxic = cIsIrritantToxic;
     }
 
-    public Long getcIsHealthHazard()
-    {
+    public String getcIsHealthHazard() {
         return cIsHealthHazard;
     }
-    public void setcIsCompressedGas(Long cIsCompressedGas)
-    {
-        this.cIsCompressedGas = cIsCompressedGas;
+
+    public void setcIsHealthHazard(String cIsHealthHazard) {
+        this.cIsHealthHazard = cIsHealthHazard;
     }
 
-    public Long getcIsCompressedGas()
-    {
+    public String getcIsCompressedGas() {
         return cIsCompressedGas;
     }
-    public void setcIsEnvironmentalHazard(Long cIsEnvironmentalHazard)
-    {
-        this.cIsEnvironmentalHazard = cIsEnvironmentalHazard;
+
+    public void setcIsCompressedGas(String cIsCompressedGas) {
+        this.cIsCompressedGas = cIsCompressedGas;
     }
 
-    public Long getcIsEnvironmentalHazard()
-    {
+    public String getcIsEnvironmentalHazard() {
         return cIsEnvironmentalHazard;
     }
-    public void setcIsHighTemp(Long cIsHighTemp)
-    {
-        this.cIsHighTemp = cIsHighTemp;
+
+    public void setcIsEnvironmentalHazard(String cIsEnvironmentalHazard) {
+        this.cIsEnvironmentalHazard = cIsEnvironmentalHazard;
     }
 
-    public Long getcIsHighTemp()
-    {
+    public String getcIsHighTemp() {
         return cIsHighTemp;
     }
-    public void setcIsLowTemp(Long cIsLowTemp)
-    {
-        this.cIsLowTemp = cIsLowTemp;
+
+    public void setcIsHighTemp(String cIsHighTemp) {
+        this.cIsHighTemp = cIsHighTemp;
     }
 
-    public Long getcIsLowTemp()
-    {
+    public String getcIsLowTemp() {
         return cIsLowTemp;
     }
-    public void setcIsPosPressure(Long cIsPosPressure)
-    {
-        this.cIsPosPressure = cIsPosPressure;
+
+    public void setcIsLowTemp(String cIsLowTemp) {
+        this.cIsLowTemp = cIsLowTemp;
     }
 
-    public Long getcIsPosPressure()
-    {
+    public String getcIsPosPressure() {
         return cIsPosPressure;
     }
-    public void setcIsNegPressure(Long cIsNegPressure)
-    {
-        this.cIsNegPressure = cIsNegPressure;
+
+    public void setcIsPosPressure(String cIsPosPressure) {
+        this.cIsPosPressure = cIsPosPressure;
     }
 
-    public Long getcIsNegPressure()
-    {
+    public String getcIsNegPressure() {
         return cIsNegPressure;
     }
-    public void setcIsMovingParts(Long cIsMovingParts)
-    {
-        this.cIsMovingParts = cIsMovingParts;
+
+    public void setcIsNegPressure(String cIsNegPressure) {
+        this.cIsNegPressure = cIsNegPressure;
     }
 
-    public Long getcIsMovingParts()
-    {
+    public String getcIsMovingParts() {
         return cIsMovingParts;
     }
-    public void setcIsHotSurfaces(Long cIsHotSurfaces)
-    {
-        this.cIsHotSurfaces = cIsHotSurfaces;
+
+    public void setcIsMovingParts(String cIsMovingParts) {
+        this.cIsMovingParts = cIsMovingParts;
     }
 
-    public Long getcIsHotSurfaces()
-    {
+    public String getcIsHotSurfaces() {
         return cIsHotSurfaces;
     }
-    public void setcIsColdSurfaces(Long cIsColdSurfaces)
-    {
-        this.cIsColdSurfaces = cIsColdSurfaces;
+
+    public void setcIsHotSurfaces(String cIsHotSurfaces) {
+        this.cIsHotSurfaces = cIsHotSurfaces;
     }
 
-    public Long getcIsColdSurfaces()
-    {
+    public String getcIsColdSurfaces() {
         return cIsColdSurfaces;
     }
-    public void setcIsVoltages(Long cIsVoltages)
-    {
-        this.cIsVoltages = cIsVoltages;
+
+    public void setcIsColdSurfaces(String cIsColdSurfaces) {
+        this.cIsColdSurfaces = cIsColdSurfaces;
     }
 
-    public Long getcIsVoltages()
-    {
+    public String getcIsVoltages() {
         return cIsVoltages;
     }
-    public void setcIsOtherDanger(Long cIsOtherDanger)
-    {
-        this.cIsOtherDanger = cIsOtherDanger;
+
+    public void setcIsVoltages(String cIsVoltages) {
+        this.cIsVoltages = cIsVoltages;
     }
 
-    public Long getcIsOtherDanger()
-    {
+    public String getcIsOtherDanger() {
         return cIsOtherDanger;
     }
-    public void setcOtherDangerContent(String cOtherDangerContent)
-    {
-        this.cOtherDangerContent = cOtherDangerContent;
+
+    public void setcIsOtherDanger(String cIsOtherDanger) {
+        this.cIsOtherDanger = cIsOtherDanger;
     }
 
-    public String getcOtherDangerContent()
-    {
+    public String getcOtherDangerContent() {
         return cOtherDangerContent;
     }
-    public void setcIsHazardsProd(Long cIsHazardsProd)
-    {
-        this.cIsHazardsProd = cIsHazardsProd;
+
+    public void setcOtherDangerContent(String cOtherDangerContent) {
+        this.cOtherDangerContent = cOtherDangerContent;
     }
 
-    public Long getcIsHazardsProd()
-    {
+    public String getcIsHazardsProd() {
         return cIsHazardsProd;
     }
+
+    public void setcIsHazardsProd(String cIsHazardsProd) {
+        this.cIsHazardsProd = cIsHazardsProd;
+    }
+
     public void setcIsHazardsProdContent(String cIsHazardsProdContent)
     {
         this.cIsHazardsProdContent = cIsHazardsProdContent;
@@ -2704,240 +2717,215 @@ public class TRestrictedSpacePermit extends BaseEntity
     {
         return dSafeLiftedDate61;
     }
-    public void seteIsPresent(Long eIsPresent)
-    {
-        this.eIsPresent = eIsPresent;
-    }
 
-    public Long geteIsPresent()
-    {
+    public String geteIsPresent() {
         return eIsPresent;
     }
-    public void seteIsRequiredPpe(Long eIsRequiredPpe)
-    {
-        this.eIsRequiredPpe = eIsRequiredPpe;
+
+    public void seteIsPresent(String eIsPresent) {
+        this.eIsPresent = eIsPresent;
     }
 
-    public Long geteIsRequiredPpe()
-    {
+    public String geteIsRequiredPpe() {
         return eIsRequiredPpe;
     }
-    public void setePpeContent(String ePpeContent)
-    {
-        this.ePpeContent = ePpeContent;
+
+    public void seteIsRequiredPpe(String eIsRequiredPpe) {
+        this.eIsRequiredPpe = eIsRequiredPpe;
     }
 
-    public String getePpeContent()
-    {
+    public String getePpeContent() {
         return ePpeContent;
     }
-    public void seteIsSafeGoggles(Long eIsSafeGoggles)
-    {
-        this.eIsSafeGoggles = eIsSafeGoggles;
+
+    public void setePpeContent(String ePpeContent) {
+        this.ePpeContent = ePpeContent;
     }
 
-    public Long geteIsSafeGoggles()
-    {
+    public String geteIsSafeGoggles() {
         return eIsSafeGoggles;
     }
-    public void seteIsFaceShield(Long eIsFaceShield)
-    {
-        this.eIsFaceShield = eIsFaceShield;
+
+    public void seteIsSafeGoggles(String eIsSafeGoggles) {
+        this.eIsSafeGoggles = eIsSafeGoggles;
     }
 
-    public Long geteIsFaceShield()
-    {
+    public String geteIsFaceShield() {
         return eIsFaceShield;
     }
-    public void seteIsProtectGloves(Long eIsProtectGloves)
-    {
-        this.eIsProtectGloves = eIsProtectGloves;
+
+    public void seteIsFaceShield(String eIsFaceShield) {
+        this.eIsFaceShield = eIsFaceShield;
     }
 
-    public Long geteIsProtectGloves()
-    {
+    public String geteIsProtectGloves() {
         return eIsProtectGloves;
     }
-    public void seteProtectGlovesContent(String eProtectGlovesContent)
-    {
-        this.eProtectGlovesContent = eProtectGlovesContent;
+
+    public void seteIsProtectGloves(String eIsProtectGloves) {
+        this.eIsProtectGloves = eIsProtectGloves;
     }
 
-    public String geteProtectGlovesContent()
-    {
+    public String geteProtectGlovesContent() {
         return eProtectGlovesContent;
     }
-    public void seteIsRubberBoots(Long eIsRubberBoots)
-    {
-        this.eIsRubberBoots = eIsRubberBoots;
+
+    public void seteProtectGlovesContent(String eProtectGlovesContent) {
+        this.eProtectGlovesContent = eProtectGlovesContent;
     }
 
-    public Long geteIsRubberBoots()
-    {
+    public String geteIsRubberBoots() {
         return eIsRubberBoots;
     }
-    public void seteIsContinueMonitoring(String eIsContinueMonitoring)
-    {
-        this.eIsContinueMonitoring = eIsContinueMonitoring;
+
+    public void seteIsRubberBoots(String eIsRubberBoots) {
+        this.eIsRubberBoots = eIsRubberBoots;
     }
 
-    public String geteIsContinueMonitoring()
-    {
+    public String geteIsContinueMonitoring() {
         return eIsContinueMonitoring;
     }
-    public void seteIsRubberApron(Long eIsRubberApron)
-    {
-        this.eIsRubberApron = eIsRubberApron;
+
+    public void seteIsContinueMonitoring(String eIsContinueMonitoring) {
+        this.eIsContinueMonitoring = eIsContinueMonitoring;
     }
 
-    public Long geteIsRubberApron()
-    {
+    public String geteIsRubberApron() {
         return eIsRubberApron;
     }
-    public void seteIsProtectSuit(Long eIsProtectSuit)
-    {
-        this.eIsProtectSuit = eIsProtectSuit;
+
+    public void seteIsRubberApron(String eIsRubberApron) {
+        this.eIsRubberApron = eIsRubberApron;
     }
 
-    public Long geteIsProtectSuit()
-    {
+    public String geteIsProtectSuit() {
         return eIsProtectSuit;
     }
-    public void seteSafeAttendantSign(String eSafeAttendantSign)
-    {
-        this.eSafeAttendantSign = eSafeAttendantSign;
+
+    public void seteIsProtectSuit(String eIsProtectSuit) {
+        this.eIsProtectSuit = eIsProtectSuit;
     }
 
-    public String geteSafeAttendantSign()
-    {
+    public String geteSafeAttendantSign() {
         return eSafeAttendantSign;
     }
-    public void seteProtectSuitContent(String eProtectSuitContent)
-    {
-        this.eProtectSuitContent = eProtectSuitContent;
+
+    public void seteSafeAttendantSign(String eSafeAttendantSign) {
+        this.eSafeAttendantSign = eSafeAttendantSign;
     }
 
-    public String geteProtectSuitContent()
-    {
+    public String geteProtectSuitContent() {
         return eProtectSuitContent;
     }
-    public void seteIsResProtect(Long eIsResProtect)
-    {
-        this.eIsResProtect = eIsResProtect;
+
+    public void seteProtectSuitContent(String eProtectSuitContent) {
+        this.eProtectSuitContent = eProtectSuitContent;
     }
 
-    public Long geteIsResProtect()
-    {
+    public String geteIsResProtect() {
         return eIsResProtect;
     }
-    public void seteResProtectContent(String eResProtectContent)
-    {
-        this.eResProtectContent = eResProtectContent;
+
+    public void seteIsResProtect(String eIsResProtect) {
+        this.eIsResProtect = eIsResProtect;
     }
 
-    public String geteResProtectContent()
-    {
+    public String geteResProtectContent() {
         return eResProtectContent;
     }
-    public void seteIsFallArrest(Long eIsFallArrest)
-    {
-        this.eIsFallArrest = eIsFallArrest;
+
+    public void seteResProtectContent(String eResProtectContent) {
+        this.eResProtectContent = eResProtectContent;
     }
 
-    public Long geteIsFallArrest()
-    {
+    public String geteIsFallArrest() {
         return eIsFallArrest;
     }
-    public void seteFallArrestContent(String eFallArrestContent)
-    {
-        this.eFallArrestContent = eFallArrestContent;
+
+    public void seteIsFallArrest(String eIsFallArrest) {
+        this.eIsFallArrest = eIsFallArrest;
     }
 
-    public String geteFallArrestContent()
-    {
+    public String geteFallArrestContent() {
         return eFallArrestContent;
     }
-    public void seteIsOtherProtect(Long eIsOtherProtect)
-    {
-        this.eIsOtherProtect = eIsOtherProtect;
+
+    public void seteFallArrestContent(String eFallArrestContent) {
+        this.eFallArrestContent = eFallArrestContent;
     }
 
-    public Long geteIsOtherProtect()
-    {
+    public String geteIsOtherProtect() {
         return eIsOtherProtect;
     }
-    public void seteOtherProtectContent(String eOtherProtectContent)
-    {
-        this.eOtherProtectContent = eOtherProtectContent;
+
+    public void seteIsOtherProtect(String eIsOtherProtect) {
+        this.eIsOtherProtect = eIsOtherProtect;
     }
 
-    public String geteOtherProtectContent()
-    {
+    public String geteOtherProtectContent() {
         return eOtherProtectContent;
     }
-    public void seteSafeAttendant(String eSafeAttendant)
-    {
-        this.eSafeAttendant = eSafeAttendant;
+
+    public void seteOtherProtectContent(String eOtherProtectContent) {
+        this.eOtherProtectContent = eOtherProtectContent;
     }
 
-    public String geteSafeAttendant()
-    {
+    public String geteSafeAttendant() {
         return eSafeAttendant;
     }
-    public void seteIsNaturalVen(Long eIsNaturalVen)
-    {
-        this.eIsNaturalVen = eIsNaturalVen;
+
+    public void seteSafeAttendant(String eSafeAttendant) {
+        this.eSafeAttendant = eSafeAttendant;
     }
 
-    public Long geteIsNaturalVen()
-    {
+    public String geteIsNaturalVen() {
         return eIsNaturalVen;
     }
-    public void seteNaturalVenContent(String eNaturalVenContent)
-    {
-        this.eNaturalVenContent = eNaturalVenContent;
+
+    public void seteIsNaturalVen(String eIsNaturalVen) {
+        this.eIsNaturalVen = eIsNaturalVen;
     }
 
-    public String geteNaturalVenContent()
-    {
+    public String geteNaturalVenContent() {
         return eNaturalVenContent;
     }
-    public void seteIsMecVen(Long eIsMecVen)
-    {
-        this.eIsMecVen = eIsMecVen;
+
+    public void seteNaturalVenContent(String eNaturalVenContent) {
+        this.eNaturalVenContent = eNaturalVenContent;
     }
 
-    public Long geteIsMecVen()
-    {
+    public String geteIsMecVen() {
         return eIsMecVen;
     }
-    public void seteMecVenContent(String eMecVenContent)
-    {
-        this.eMecVenContent = eMecVenContent;
+
+    public void seteIsMecVen(String eIsMecVen) {
+        this.eIsMecVen = eIsMecVen;
     }
 
-    public String geteMecVenContent()
-    {
+    public String geteMecVenContent() {
         return eMecVenContent;
     }
-    public void seteIsExxtractDust(Long eIsExxtractDust)
-    {
-        this.eIsExxtractDust = eIsExxtractDust;
+
+    public void seteMecVenContent(String eMecVenContent) {
+        this.eMecVenContent = eMecVenContent;
     }
 
-    public Long geteIsExxtractDust()
-    {
+    public String geteIsExxtractDust() {
         return eIsExxtractDust;
     }
-    public void seteIsAnalyzeAir(Long eIsAnalyzeAir)
-    {
-        this.eIsAnalyzeAir = eIsAnalyzeAir;
+
+    public void seteIsExxtractDust(String eIsExxtractDust) {
+        this.eIsExxtractDust = eIsExxtractDust;
     }
 
-    public Long geteIsAnalyzeAir()
-    {
+    public String geteIsAnalyzeAir() {
         return eIsAnalyzeAir;
     }
+
+    public void seteIsAnalyzeAir(String eIsAnalyzeAir) {
+        this.eIsAnalyzeAir = eIsAnalyzeAir;
+    }
+
     public void seteAnalyzeAirContent(String eAnalyzeAirContent)
     {
         this.eAnalyzeAirContent = eAnalyzeAirContent;
@@ -2956,12 +2944,12 @@ public class TRestrictedSpacePermit extends BaseEntity
     {
         return eAnalyzeAirInterval;
     }
-    public void seteIsOtherVen(Long eIsOtherVen)
+    public void seteIsOtherVen(String eIsOtherVen)
     {
         this.eIsOtherVen = eIsOtherVen;
     }
 
-    public Long geteIsOtherVen()
+    public String geteIsOtherVen()
     {
         return eIsOtherVen;
     }
@@ -3308,6 +3296,46 @@ public class TRestrictedSpacePermit extends BaseEntity
         return mOtherLicenceThree;
     }
 
+    public String getIsEquipmentHazards() {
+        return isEquipmentHazards;
+    }
+
+    public void setIsEquipmentHazards(String isEquipmentHazards) {
+        this.isEquipmentHazards = isEquipmentHazards;
+    }
+
+    public String getIsFacilityHazards() {
+        return isFacilityHazards;
+    }
+
+    public void setIsFacilityHazards(String isFacilityHazards) {
+        this.isFacilityHazards = isFacilityHazards;
+    }
+
+    public String getcIsOtherA() {
+        return cIsOtherA;
+    }
+
+    public void setcIsOtherA(String cIsOtherA) {
+        this.cIsOtherA = cIsOtherA;
+    }
+
+    public String getePpeContent2() {
+        return ePpeContent2;
+    }
+
+    public void setePpeContent2(String ePpeContent2) {
+        this.ePpeContent2 = ePpeContent2;
+    }
+
+    public String geteMonitor() {
+        return eMonitor;
+    }
+
+    public void seteMonitor(String eMonitor) {
+        this.eMonitor = eMonitor;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ui/src/views/invoicing/restrictedspace/index.vue

@@ -144,7 +144,7 @@
                 <table style="width: 100%;">
                   <tr>
                     <td colspan="2" class="short-checkbox">
-                      <el-checkbox v-model="form.isYesDanger" true-label="1" false-label="0"/>
+                      <el-checkbox v-model="form.cIsYesDanger" true-label="1" false-label="0"/>
                       危害物质（正常运行时存在于设备中的物料名称）：
                       <!-- 物料数据源绑定 -->
                       <el-select v-model="form.cHarmMatterName" clearable placeholder="请选择物料名称"
@@ -165,84 +165,84 @@
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/toxicIcon.png')">
                           </el-image>
                           <div>毒性</div>
-                          <el-checkbox v-model="cIsToxic" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsToxic" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/flammableIcon.png')">
                           </el-image>
                           <div>易燃性</div>
-                          <el-checkbox v-model="cIsFlammable" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsFlammable" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/oxidizingIcon.png')">
                           </el-image>
                           <div>氧化性</div>
-                          <el-checkbox v-model="cIsOxidizing" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsOxidizing" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/explosiveIcon.png')">
                           </el-image>
                           <div>爆炸性</div>
-                          <el-checkbox v-model="cIsExplosive" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsExplosive" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/corrosiveIcon.png')">
                           </el-image>
                           <div>腐蚀性</div>
-                          <el-checkbox v-model="cIsCorrosive" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsCorrosive" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;"
                                     :src="require('@/assets/image/irritantSensitizationToxicIcon.png')">
                           </el-image>
                           <div>刺激性/致敏性/毒性</div>
-                          <el-checkbox v-model="cIsIrritantToxic" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsIrritantToxic" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;"
                                     :src="require('@/assets/image/healthHazardIcon.png')">
                           </el-image>
                           <div>健康危害</div>
-                          <el-checkbox v-model="cIsHealthHazard" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsHealthHazard" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;"
                                     :src="require('@/assets/image/compressedGasIcon.png')">
                           </el-image>
                           <div>压力下气体</div>
-                          <el-checkbox v-model="cIsCompressedGas" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsCompressedGas" true-label="1" false-label="0"/>
                         </el-col>
                         <el-col :span="2.5" style="text-align: center">
                           <el-image style="width: 70px;height: 70px;"
                                     :src="require('@/assets/image/environmentalHazardIcon.png')">
                           </el-image>
                           <div>危害水生环境</div>
-                          <el-checkbox v-model="cIsEnvironmentalHazard" true-label="1" false-label="0"/>
+                          <el-checkbox v-model="form.cIsEnvironmentalHazard" true-label="1" false-label="0"/>
                         </el-col>
                       </el-row>
                     </td>
                   </tr>
                   <tr>
                     <td class="short-checkbox">
-                      <el-checkbox v-model="isEquipmentHazards" true-label="1" false-label="0"
+                      <el-checkbox v-model="form.isEquipmentHazards" true-label="1" false-label="0"
                                    @change="eHazardsChange"/>
                       设备内物质处于危险状态
                       （
                       <el-checkbox v-model="form.cIsHighTemp" true-label="1" false-label="0"
-                                   :disabled="isEquipmentHazards==true?false:true" @change="highTempChange"/>
+                                   :disabled="form.isEquipmentHazards==true?false:true" @change="highTempChange"/>
                       高温
                       /
                       <el-checkbox v-model="form.cIsLowTemp" true-label="1" false-label="0"
-                                   :disabled="isEquipmentHazards==true?false:true"
+                                   :disabled="form.isEquipmentHazards==true?false:true"
                                    @change="lowTempChange"/>
                       低温；
                       <el-checkbox v-model="form.cIsPosPressure" true-label="1" false-label="0"
-                                   :disabled="isEquipmentHazards==true?false:true"
+                                   :disabled="form.isEquipmentHazards==true?false:true"
                                    @change="posPressureChange"/>
                       正压
                       /
                       <el-checkbox v-model="form.cIsNegPressure" true-label="1" false-label="0"
-                                   :disabled="isEquipmentHazards==true?false:true"
+                                   :disabled="form.isEquipmentHazards==true?false:true"
                                    @change="negPressureChange"/>
                       负压
                       ）
@@ -257,28 +257,28 @@
                   </tr>
                   <tr>
                     <td class="short-checkbox">
-                      <el-checkbox v-model="isFacilityHazards" true-label="1" false-label="0"
+                      <el-checkbox v-model="form.isFacilityHazards" true-label="1" false-label="0"
                                    @change="facilityChange"/>
 
                       来自设备/设施的危害（
                       <el-checkbox v-model="form.cIsMovingParts" true-label="1" false-label="0"
-                                   :disabled="isFacilityHazards==true?false:true"/>
+                                   :disabled="form.isFacilityHazards==true?false:true"/>
                       移动部件，
                       <el-checkbox v-model="form.cIsHotSurfaces" true-label="1" false-label="0"
-                                   :disabled="isFacilityHazards==true?false:true"
+                                   :disabled="form.isFacilityHazards==true?false:true"
                                    @change="hotSurfacesChange"/>
                       热表面/
                       <el-checkbox v-model="form.cIsColdSurfaces" true-label="1" false-label="0"
-                                   :disabled="isFacilityHazards==true?false:true"
+                                   :disabled="form.isFacilityHazards==true?false:true"
                                    @change="coldSurfacesChange"/>
                       冷表面，
                       <el-checkbox v-model="form.cIsVoltages" true-label="1" false-label="0"
-                                   :disabled="isFacilityHazards==true?false:true"/>
+                                   :disabled="form.isFacilityHazards==true?false:true"/>
                       电压
                       ）
                     </td>
                     <td class="short-checkbox">
-                      <el-checkbox v-model="form.cIsOtherA" :true-label="1" :false-label="0"/>
+                      <el-checkbox v-model="form.cIsOtherA" true-label="1" false-label="0"/>
                       涉及的其它作业，相关许可证：
                       <el-input style="width: 158px;" v-model="form.cOtherId"><i slot="prefix" class="el-input__icon el-icon-word">A</i>
                       </el-input>
@@ -286,7 +286,7 @@
                   </tr>
                   <tr>
                     <td class="short-checkbox" colspan="2">
-                      <el-checkbox v-model="form.cIsOtherDanger" true-label="1" :false-label="0"/>
+                      <el-checkbox v-model="form.cIsOtherDanger" true-label="1" false-label="0"/>
                       其它危害：
                       <el-input v-model="form.cOtherDangerContent" style="width: calc(100% - 104px)"/>
                     </td>
@@ -1109,7 +1109,7 @@
                       </tr>
                       <tr>
                         <td>项目：
-                          <el-input style="width: calc(100% - 44px)" />
+                          <el-input v-model="form.ePpeContent2" style="width: calc(100% - 44px)" />
                         </td>
                         <td></td>
                         <td></td>
@@ -1134,7 +1134,7 @@
                       </tr>
                       <tr>
                         <td>2.3 防护手套，类型：
-                          <el-select :disabled="eIsProtectGloves==1?false:true" style="width: calc(100% - 130px)"
+                          <el-select :disabled="form.eIsProtectGloves==1?false:true" style="width: calc(100% - 130px)"
                                      v-model="form.eProtectGlovesContent" placeholder="请选择防护手套">
                             <el-option v-for="dict in safeGoggles" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
@@ -1170,7 +1170,7 @@
                       </tr>
                       <tr>
                         <td>2.6 防护服，类型：
-                          <el-select :disabled="eIsProtectSuit==1?false:true" style="width: calc(100% - 118px)"
+                          <el-select :disabled="form.eIsProtectSuit==1?false:true" style="width: calc(100% - 118px)"
                                      v-model="form.eProtectSuitContent" placeholder="请选择防护服">
                             <el-option v-for="dict in protectSuits" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
@@ -1188,7 +1188,7 @@
                       </tr>
                       <tr>
                         <td>2.7 呼吸保护用品，类型：
-                          <el-select :disabled="eIsResProtect==1?false:true" style="width: calc(100% - 157px)"
+                          <el-select :disabled="form.eIsResProtect==1?false:true" style="width: calc(100% - 157px)"
                                      v-model="form.eResProtectContent" placeholder="请选择防护面罩">
                             <el-option v-for="dict in resProtects" :key="dict.id"
                                        :label="dict.conservatoryMeasureName"
@@ -1207,7 +1207,7 @@
                       <tr>
                         <td>2.8 防坠落装置，类型：
                           <el-select style="width: calc(100% - 144px)" clearable v-model="form.eFallArrestContent" filterable
-                                     :disabled="eIsFallArrest==1?false:true">
+                                     :disabled="form.eIsFallArrest==1?false:true">
                             <el-option v-for="item in eFallArrestContents" :key="item.id" :label="item.name"
                                        :value="item.id">
                             </el-option>
@@ -1247,7 +1247,7 @@
                         <td><b>3. 连续的监控</b></td>
                       </tr>
                       <tr>
-                        <td>观察员，提供单位：<el-input style="width: calc(100% - 117px)" /></td>
+                        <td>观察员，提供单位：<el-input v-model="form.eMonitor" style="width: calc(100% - 117px)" /></td>
                       </tr>
                       <tr>
                         <td>安全监护人，提供单位：
@@ -1761,6 +1761,7 @@ import { listMatters } from "@/api/ehs/throughcleanbcc";
 import { addPermit, getPermit, updatePermit } from "@/api/invoicing/restrictedspace";
 import { batchAddJobticket } from "@/api/ehs/jobticket";
 import { updateWorkcontent } from "@/api/invoice/workcontent";
+import { getForType } from "@/api/configuration/protect";
 
 export default {
   data() {
@@ -1815,6 +1816,44 @@ export default {
       }
     };
     return {
+      eAnalyzeAirIntervals: [
+        {
+          id: '1h/次',
+          name: '1h/次'
+        },
+        {
+          id: '2h/次',
+          name: '2h/次'
+        },
+        {
+          id: '6h/次',
+          name: '6h/次'
+        },
+        {
+          id: '12h/次',
+          name: '12h/次'
+        }
+      ],
+      eFallArrestContents: [
+        {
+          id: '腰部护带',
+          name: '腰部护带'
+        },
+        {
+          id: '全身护带',
+          name: '全身护带'
+        }
+      ],
+      protectSuits: [], //防护服
+      eIsResProtect: null,
+      eResProtectContent: null,
+      resProtectsParams: {
+        protectType: '3',
+      },
+      safeGoggles: [], //防护手套
+      safeGogglesParams: {
+        protectType: '1',
+      },
       pdf: {
         title: '',
         pdfUrl: '',
@@ -2151,6 +2190,15 @@ export default {
   /* 页面渲染前执行的方法*/
   created() {
     this.queryMatters();
+    getForType(this.safeGogglesParams).then(response => {
+      this.safeGoggles = response.data;
+    });
+    getForType(this.protectSuitsParams).then(response => {
+      this.protectSuits = response.data;
+    });
+    getForType(this.resProtectsParams).then(response => {
+      this.resProtects = response.data;
+    });
     //加载施工单位
     listDept(this.aConstructionsQuery).then(response => {
       this.aConstructions = response.data;
@@ -2159,9 +2207,16 @@ export default {
     if (id != null) {
       getPermit(id).then(response => {
         this.form = response.data;
+        //B
         this.value1 = [];
         this.value1[0] = this.form.bValidityStartTime;
         this.value1[1] = this.form.bValidityEndTime;
+        //C
+        this.form.cHarmMatterName = Number(this.form.cHarmMatterName);
+        //E
+        this.form.eProtectGlovesContent = Number(this.form.eProtectGlovesContent);
+        this.form.eProtectSuitContent = Number(this.form.eProtectSuitContent);
+        this.form.eResProtectContent = Number(this.form.eResProtectContent);
         this.dataLoading(this.form);
         this.msgSuccess(this.$t('数据加载成功'));
         console.log('1231231-----', this.form)
@@ -2170,6 +2225,36 @@ export default {
     }
   },
   methods: {
+    //取消仅限定时间内佩戴的PPE选中-清除数据
+    eIsRequiredPpeChange() {
+      if (this.form.eIsRequiredPpe == '0') {
+        this.form.ePpeContent = null;
+      }
+    },
+    //取消防护手套选中-清除数据
+    eIsProtectGlovesChange() {
+      if (this.eIsProtectGloves == '0') {
+        this.eProtectGlovesContent = null;
+      }
+    },
+    //取消防护服选中-清除数据
+    eIsProtectSuitChange() {
+      if (this.eIsProtectSuit == '0') {
+        this.eProtectSuitContent = null;
+      }
+    },
+    //取消呼吸保护用品选中-清除数据
+    eIsResProtectChange() {
+      if (this.eIsResProtect == '0') {
+        this.eResProtectContent = null;
+      }
+    },
+    //取消防坠落装置选中-清除数据
+    eIsFallArrestChange() {
+      if (this.eIsFallArrest == '0') {
+        this.form.eFallArrestContent = null;
+      }
+    },
     handleSee() {
       console.log(this.form.pdfUrl)
       this.loadingFlash = true