-修改高出票

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

@@ -180,7 +180,7 @@ public class TPermitWorkHighController extends BaseController {
         params.put("bAreaNo", Texts.of(tPermitWorkHigh.getbAreaNo()).fontSize(7).bold().create());
         params.put("bWorkContent", Texts.of(tPermitWorkHigh.getbWorkContent()).fontSize(7).bold().create());
         getCheck(params, tPermitWorkHigh.getbHeight(), "bHeight1", "bHeight2", "bHeight3", "bHeight4");
-        getCheck(params, tPermitWorkHigh.getbWorkLevel(), "bWorkLevel1","bWorkLevel2","bWorkLevel3","bWorkLevel4");
+        getCheck(params, tPermitWorkHigh.getbWorkLevel(), "bWorkLevel1", "bWorkLevel2", "bWorkLevel3", "bWorkLevel4");
         if (tPermitWorkHigh.getbValidityStartTime() != null) {
             params.put("bValidityStartTime", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分", tPermitWorkHigh.getbValidityStartTime())).fontSize(7).bold().create());
         } else {
@@ -228,26 +228,26 @@ public class TPermitWorkHighController extends BaseController {
         params.put("cOtherId", Texts.of(checkParam(tPermitWorkHigh.getcOtherId())).fontSize(7).bold().create());
 
         //E栏
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsPresent()),"eIsPresent1","eIsPresent2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsRequiredPpe()),"eIsRequiredPpe1","eIsRequiredPpe2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsSafeGoggles()),"eIsSafeGoggles1","eIsSafeGoggles2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsFaceShield()),"eIsFaceShield1","eIsFaceShield2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsProtectGloves()),"eIsProtectGloves1","eIsProtectGloves2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsRubberBoots()),"eIsRubberBoots1","eIsRubberBoots2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsRubberApron()),"eIsRubberApron1","eIsRubberApron2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsProtectSuit()),"eIsProtectSuit1","eIsProtectSuit2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsResProtect()),"eIsResProtect1","eIsResProtect2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsFallArrest()),"eIsFallArrest1","eIsFallArrest2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherProtect()),"eIsOtherProtect1","eIsOtherProtect2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsContinueMonitoring()),"eIsContinueMonitoring1","eIsContinueMonitoring2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsNaturalVen()),"eIsNaturalVen1","eIsNaturalVen2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsMecVen()),"eIsMecVen1","eIsMecVen2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsExxtractDust()),"eIsExxtractDust1","eIsExxtractDust2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsAnalyzeAir()),"eIsAnalyzeAir1","eIsAnalyzeAir2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherVen()),"eIsOtherVen1","eIsOtherVen2");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherSafety()),"eIsOtherSafety1","eIsOtherSafety1");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsToolBag()),"eIsToolBag");
-         getCheck(params, checkParam(tPermitWorkHigh.geteIsSafetyRope()),"eIsSafetyRope");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsPresent()), "eIsPresent1", "eIsPresent2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsRequiredPpe()), "eIsRequiredPpe1", "eIsRequiredPpe2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsSafeGoggles()), "eIsSafeGoggles1", "eIsSafeGoggles2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsFaceShield()), "eIsFaceShield1", "eIsFaceShield2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsProtectGloves()), "eIsProtectGloves1", "eIsProtectGloves2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsRubberBoots()), "eIsRubberBoots1", "eIsRubberBoots2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsRubberApron()), "eIsRubberApron1", "eIsRubberApron2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsProtectSuit()), "eIsProtectSuit1", "eIsProtectSuit2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsResProtect()), "eIsResProtect1", "eIsResProtect2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsFallArrest()), "eIsFallArrest1", "eIsFallArrest2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherProtect()), "eIsOtherProtect1", "eIsOtherProtect2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsContinueMonitoring()), "eIsContinueMonitoring1", "eIsContinueMonitoring2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsNaturalVen()), "eIsNaturalVen1", "eIsNaturalVen2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsMecVen()), "eIsMecVen1", "eIsMecVen2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsExxtractDust()), "eIsExxtractDust1", "eIsExxtractDust2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsAnalyzeAir()), "eIsAnalyzeAir1", "eIsAnalyzeAir2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherVen()), "eIsOtherVen1", "eIsOtherVen2");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsOtherSafety()), "eIsOtherSafety1", "eIsOtherSafety1");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsToolBag()), "eIsToolBag");
+        getCheck(params, checkParam(tPermitWorkHigh.geteIsSafetyRope()), "eIsSafetyRope");
         params.put("ePpeContent", Texts.of(checkParam(tPermitWorkHigh.getePpeContent())).fontSize(7).bold().create());
         params.put("eProtectSuitContent", Texts.of(checkParam(tPermitWorkHigh.geteProtectSuitContent())).fontSize(7).bold().create());
         params.put("eProtectGlovesContent", Texts.of(checkParam(tPermitWorkHigh.geteProtectGlovesContent())).fontSize(7).bold().create());
@@ -263,7 +263,207 @@ public class TPermitWorkHighController extends BaseController {
         params.put("ePreventContent", Texts.of(checkParam(tPermitWorkHigh.getePreventContent())).fontSize(7).bold().create());
         params.put("eOtherVenContent", Texts.of(checkParam(tPermitWorkHigh.geteOtherVenContent())).fontSize(7).bold().create());
         params.put("eOtherSafetyContent", Texts.of(checkParam(tPermitWorkHigh.geteOtherSafetyContent())).fontSize(7).bold().create());
+        params.put("dBreakInclContent", Texts.of(checkParam(tPermitWorkHigh.getdBreakInclContent())).fontSize(7).bold().create());
+        params.put("dEleCircuitNo", Texts.of(checkParam(tPermitWorkHigh.getdEleCircuitNo())).fontSize(7).bold().create());
+        params.put("dInsTagNo", Texts.of(checkParam(tPermitWorkHigh.getdInsTagNo())).fontSize(7).bold().create());
+        params.put("dLockoutUsingContent", Texts.of(checkParam(tPermitWorkHigh.getdLockoutUsingContent())).fontSize(7).bold().create());
+        params.put("dIsOtherEquSafeContent", Texts.of(checkParam(tPermitWorkHigh.getdIsOtherEquSafeContent())).fontSize(7).bold().create());
+        params.put("dMecSecureContent", Texts.of(checkParam(tPermitWorkHigh.getdMecSecureContent())).fontSize(7).bold().create());
+        params.put("dOtherSafePlantContent", Texts.of(checkParam(tPermitWorkHigh.getdOtherSafePlantContent())).fontSize(7).bold().create());
+        params.put("dCleanContent", Texts.of(checkParam(tPermitWorkHigh.getdCleanContent())).fontSize(7).bold().create());
+        params.put("dFlushContent", Texts.of(checkParam(tPermitWorkHigh.getdFlushContent())).fontSize(7).bold().create());
+        params.put("dOtherCleanContent", Texts.of(checkParam(tPermitWorkHigh.getdOtherCleanContent())).fontSize(7).bold().create());
+        params.put("dSiteDemarcationContent", Texts.of(checkParam(tPermitWorkHigh.getdSiteDemarcationContent())).fontSize(7).bold().create());
+        params.put("dAreaCoverContent", Texts.of(checkParam(tPermitWorkHigh.getdAreaCoverContent())).fontSize(7).bold().create());
+        params.put("dLeakDrainContent", Texts.of(checkParam(tPermitWorkHigh.getdLeakDrainContent())).fontSize(7).bold().create());
+        params.put("dOtherLightContent", Texts.of(checkParam(tPermitWorkHigh.getdOtherLightContent())).fontSize(7).bold().create());
+        params.put("dEffectUnit", Texts.of(checkParam(tPermitWorkHigh.getdEffectUnit())).fontSize(7).bold().create());
+        params.put("dEffectLeader", Texts.of(checkParam(tPermitWorkHigh.getdEffectLeader())).fontSize(7).bold().create());
+        params.put("dEffectMeasure", Texts.of(checkParam(tPermitWorkHigh.getdEffectMeasure())).fontSize(7).bold().create());
+        params.put("dOtherSafeContent", Texts.of(checkParam(tPermitWorkHigh.getdOtherSafeContent())).fontSize(7).bold().create());
+        params.put("dOtherMeasureContent", Texts.of(checkParam(tPermitWorkHigh.getdOtherMeasureContent())).fontSize(7).bold().create());
+        params.put("dPartakeBriefingSign", Texts.of(checkParam(tPermitWorkHigh.getdPartakeBriefingSign())).fontSize(7).bold().create());
+        params.put("dPartakeBriefingDate", Texts.of(checkParam(tPermitWorkHigh.getdPartakeBriefingDate())).fontSize(7).bold().create());
+        params.put("dSafeImplSign11", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign11())).fontSize(7).bold().create());
+        params.put("dSafeImplDate11", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate11())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign11", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign11())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate11", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate11())).fontSize(7).bold().create());
+        params.put("dSafeImplSign12", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign12())).fontSize(7).bold().create());
+        params.put("dSafeImplDate12", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate12())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign12", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign12())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate12", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate12())).fontSize(7).bold().create());
+        params.put("dSafeImplSign13", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign13())).fontSize(7).bold().create());
+        params.put("dSafeImplDate13", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate13())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign13", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign13())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate13", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate13())).fontSize(7).bold().create());
+        params.put("dSafeImplSign14", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign14())).fontSize(7).bold().create());
+        params.put("dSafeImplDate14", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate14())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign14", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign14())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate14", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate14())).fontSize(7).bold().create());
+        params.put("dSafeImplSign21", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign21())).fontSize(7).bold().create());
+        params.put("dSafeImplDate21", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate21())).fontSize(7).bold().create());
+        params.put("dSafeImplSign22", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign22())).fontSize(7).bold().create());
+        params.put("dSafeImplDate22", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate22())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign22", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign22())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate22", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate22())).fontSize(7).bold().create());
+        params.put("dSafeImplSign23", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign23())).fontSize(7).bold().create());
+        params.put("dSafeImplDate23", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate23())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign23", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign23())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate23", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate23())).fontSize(7).bold().create());
+        params.put("dSafeImplSign24", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign24())).fontSize(7).bold().create());
+        params.put("dSafeImplDate24", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate24())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign24", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign24())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate24", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate24())).fontSize(7).bold().create());
+        params.put("dSafeImplSign25", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign25())).fontSize(7).bold().create());
+        params.put("dSafeImplDate25", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate25())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign25", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign25())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate25", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate25())).fontSize(7).bold().create());
+        params.put("dSafeImplSign26", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign26())).fontSize(7).bold().create());
+        params.put("dSafeImplDate26", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate26())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign26", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign26())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate26", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate26())).fontSize(7).bold().create());
+        params.put("dSafeImplSign27", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign27())).fontSize(7).bold().create());
+        params.put("dSafeImplDate27", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate27())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign27", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign27())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate27", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate27())).fontSize(7).bold().create());
+        params.put("dSafeImplSign28", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign28())).fontSize(7).bold().create());
+        params.put("dSafeImplDate28", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate28())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign28", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign28())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate28", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate28())).fontSize(7).bold().create());
+        params.put("dSafeImplSign29", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign29())).fontSize(7).bold().create());
+        params.put("dSafeImplDate29", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate29())).fontSize(7).bold().create());
+        params.put("dSafeImplSign210", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign210())).fontSize(7).bold().create());
+        params.put("dSafeImplDate210", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate210())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign210", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign210())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate210", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate210())).fontSize(7).bold().create());
+        params.put("dSafeImplSign31", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign31())).fontSize(7).bold().create());
+        params.put("dSafeImplDate31", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate31())).fontSize(7).bold().create());
+        params.put("dSafeImplSign32", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign32())).fontSize(7).bold().create());
+        params.put("dSafeImplDate32", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate32())).fontSize(7).bold().create());
+        params.put("dSafeImplSign33", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign33())).fontSize(7).bold().create());
+        params.put("dSafeImplDate33", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate33())).fontSize(7).bold().create());
+        params.put("dSafeImplSign34", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign34())).fontSize(7).bold().create());
+        params.put("dSafeImplDate34", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate34())).fontSize(7).bold().create());
+        params.put("dSafeImplSign41", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign41())).fontSize(7).bold().create());
+        params.put("dSafeImplDate41", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate41())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign41", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign41())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate41", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate41())).fontSize(7).bold().create());
+        params.put("dSafeImplSign42", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign42())).fontSize(7).bold().create());
+        params.put("dSafeImplDate42", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate42())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign42", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign42())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate42", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate42())).fontSize(7).bold().create());
+        params.put("dSafeImplSign43", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign43())).fontSize(7).bold().create());
+        params.put("dSafeImplDate43", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate43())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign43", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign43())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate43", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate43())).fontSize(7).bold().create());
+        params.put("dSafeImplSign44", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign44())).fontSize(7).bold().create());
+        params.put("dSafeImplDate44", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate44())).fontSize(7).bold().create());
+        params.put("dSafeImplSign45", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign45())).fontSize(7).bold().create());
+        params.put("dSafeImplDate45", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate45())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign45", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign45())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate45", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate45())).fontSize(7).bold().create());
+        params.put("dSafeImplSign46", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign46())).fontSize(7).bold().create());
+        params.put("dSafeImplDate46", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate46())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign46", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign46())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate46", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate46())).fontSize(7).bold().create());
+        params.put("dSafeImplSign47", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign47())).fontSize(7).bold().create());
+        params.put("dSafeImplDate47", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate47())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign47", Texts.of(checkParam(tPermitWorkHigh.getdSafeLiftedSign47())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate47", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeLiftedDate47())).fontSize(7).bold().create());
+        params.put("dSafeImplSign51", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign51())).fontSize(7).bold().create());
+        params.put("dSafeImplDate51", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate51())).fontSize(7).bold().create());
+        params.put("dSafeImplSign52", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign52())).fontSize(7).bold().create());
+        params.put("dSafeImplDate52", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate52())).fontSize(7).bold().create());
+        params.put("dSafeImplSign53", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign53())).fontSize(7).bold().create());
+        params.put("dSafeImplDate53", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate53())).fontSize(7).bold().create());
+        params.put("dSafeImplSign54", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign54())).fontSize(7).bold().create());
+        params.put("dSafeImplDate54", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate54())).fontSize(7).bold().create());
+        params.put("dSafeImplSign55", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign55())).fontSize(7).bold().create());
+        params.put("dSafeImplDate55", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate55())).fontSize(7).bold().create());
+        params.put("dSafeImplSign56", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign56())).fontSize(7).bold().create());
+        params.put("dSafeImplDate56", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate56())).fontSize(7).bold().create());
+        params.put("dSafeImplSign57", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign57())).fontSize(7).bold().create());
+        params.put("dSafeImplDate57", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate57())).fontSize(7).bold().create());
+        params.put("dSafeImplSign58", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign58())).fontSize(7).bold().create());
+        params.put("dSafeImplDate58", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate58())).fontSize(7).bold().create());
+        params.put("dSafeImplSign59", Texts.of(checkParam(tPermitWorkHigh.getdSafeImplSign59())).fontSize(7).bold().create());
+        params.put("dSafeImplDate59", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitWorkHigh.getdSafeImplDate59())).fontSize(7).bold().create());
+        params.put("fAfterWorkSafeContent", Texts.of(checkParam(tPermitWorkHigh.getfAfterWorkSafeContent())).fontSize(7).bold().create());
+        params.put("gFirstSign", Texts.of(checkParam(tPermitWorkHigh.getgFirstSign())).fontSize(7).bold().create());
+        params.put("gFirstDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getgFirstDate())).fontSize(7).bold().create());
+        params.put("gSecondSign", Texts.of(checkParam(tPermitWorkHigh.getgSecondSign())).fontSize(7).bold().create());
+        params.put("gSecondDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getgSecondDate())).fontSize(7).bold().create());
+        params.put("gThirdSign", Texts.of(checkParam(tPermitWorkHigh.getgThirdSign())).fontSize(7).bold().create());
+        params.put("gThirdDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getgThirdDate())).fontSize(7).bold().create());
+        params.put("gSpecialAssessment", Texts.of(checkParam(tPermitWorkHigh.getgSpecialAssessment())).fontSize(7).bold().create());
+        params.put("hSafeMesSign", Texts.of(checkParam(tPermitWorkHigh.gethSafeMesSign())).fontSize(7).bold().create());
+        params.put("hSafeMesDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.gethSafeMesDate())).fontSize(7).bold().create());
+        params.put("hSafeMesA4Sign", Texts.of(checkParam(tPermitWorkHigh.gethSafeMesA4Sign())).fontSize(7).bold().create());
+        params.put("hSafeMesA4Date", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.gethSafeMesA4Date())).fontSize(7).bold().create());
+        params.put("iOneASign", Texts.of(checkParam(tPermitWorkHigh.getiOneASign())).fontSize(7).bold().create());
+        params.put("iOneADate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getiOneADate())).fontSize(7).bold().create());
+        params.put("iOneBSign", Texts.of(checkParam(tPermitWorkHigh.getiOneBSign())).fontSize(7).bold().create());
+        params.put("iOneBDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getiOneBDate())).fontSize(7).bold().create());
+        params.put("jOneBSign", Texts.of(checkParam(tPermitWorkHigh.getjOneBSign())).fontSize(7).bold().create());
+        params.put("jOneBDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getjOneBDate())).fontSize(7).bold().create());
+        params.put("jResMemberSign", Texts.of(checkParam(tPermitWorkHigh.getjResMemberSign())).fontSize(7).bold().create());
+        params.put("jResMemberDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getjResMemberDate())).fontSize(7).bold().create());
+        params.put("jEISign", Texts.of(checkParam(tPermitWorkHigh.getjEISign())).fontSize(7).bold().create());
+        params.put("jEIDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getjEIDate())).fontSize(7).bold().create());
+        params.put("kConfirmSign", Texts.of(checkParam(tPermitWorkHigh.getkConfirmSign())).fontSize(7).bold().create());
+        params.put("kConfirmDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getkConfirmDate())).fontSize(7).bold().create());
+        params.put("lNoticeSign", Texts.of(checkParam(tPermitWorkHigh.getlNoticeSign())).fontSize(7).bold().create());
+        params.put("lNoticeDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getlNoticeDate())).fontSize(7).bold().create());
+        params.put("mAssessDContent", Texts.of(checkParam(tPermitWorkHigh.getmAssessDContent())).fontSize(7).bold().create());
+        params.put("mAssessDSign", Texts.of(checkParam(tPermitWorkHigh.getmAssessDSign())).fontSize(7).bold().create());
+        params.put("mAssessDDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitWorkHigh.getmAssessDDate())).fontSize(7).bold().create());
+        params.put("mOtherLicenceOne", Texts.of(checkParam(tPermitWorkHigh.getmOtherLicenceOne())).fontSize(7).bold().create());
+        params.put("mOtherLicenceTwo", Texts.of(checkParam(tPermitWorkHigh.getmOtherLicenceTwo())).fontSize(7).bold().create());
+        params.put("mOtherLicenceThree", Texts.of(checkParam(tPermitWorkHigh.getmOtherLicenceThree())).fontSize(7).bold().create());
+        params.put("dIsolationDiagramContent", Texts.of(checkParam(tPermitWorkHigh.getdIsolationDiagramContent())).fontSize(7).bold().create());
 
+        getCheck(params, checkParam(tPermitWorkHigh.getfIsOtherMeasure()), "fIsOtherMeasure1", "fIsOtherMeasure2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOpenSafe()), "dIsOpenSafe1", "dIsOpenSafe2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsDisFeeder()), "dIsDisFeeder1", "dIsDisFeeder2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsBreakIncl()), "dIsBreakIncl1", "dIsBreakIncl2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsRadioactiveSources()), "dIsRadioactiveSources1", "dIsRadioactiveSources2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOtherEquSafe()), "dIsOtherEquSafe1", "dIsOtherEquSafe2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsDepress()), "dIsDepress1", "dIsDepress2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsSingleBlocking()), "dIsSingleBlocking1", "dIsSingleBlocking2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsDoubleBlock()), "dIsDoubleBlock1", "dIsDoubleBlock2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsLockoutUsing()), "dIsLockoutUsing1", "dIsLockoutUsing2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsRemovePipe()), "dIsRemovePipe1", "dIsRemovePipe2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsDisPipes()), "dIsDisPipes1", "dIsDisPipes2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsInsertBlindPlage()), "dIsInsertBlindPlage1", "dIsInsertBlindPlage2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsMecSecure()), "dIsMecSecure1", "dIsMecSecure2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsIsolationDiagram()), "dIsIsolationDiagram1", "dIsIsolationDiagram2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOtherSafePlant()), "dIsOtherSafePlant1", "dIsOtherSafePlant2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsDrain()), "dIsDrain1", "dIsDrain2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsClean()), "dIsClean1", "dIsClean2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsFlush()), "dIsFlush1", "dIsFlush2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOhterClean()), "dIsOhterClean1", "dIsOhterClean2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsSiteDemarcation()), "dIsSiteDemarcation1", "dIsSiteDemarcation2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsAreaCover()), "dIsAreaCover1", "dIsAreaCover2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsCloseTrucks()), "dIsCloseTrucks1", "dIsCloseTrucks2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsLeakDrain()), "dIsLeakDrain1", "dIsLeakDrain2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOtherLight()), "dIsOtherLight1", "dIsOtherLight2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsEffect()), "dIsEffect1", "dIsEffect2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOtherSafe()), "dIsOtherSafe1", "dIsOtherSafe2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsScene()), "dIsScene1", "dIsScene2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsScaffold()), "dIsScaffold");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsProtectionNet()), "dIsProtectionNet");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsFence()), "dIsFence");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsSafetyRegulations()), "dIsSafetyRegulations1", "dIsSafetyRegulations2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsSafetyRope()), "dIsSafetyRope");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsFaller()), "dIsFaller");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsLamination()), "dIsLamination1", "dIsLamination2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsLightShed()), "dIsLightShed1", "dIsLightShed2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsSecure()), "dIsSecure1", "dIsSecure2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsPrepared()), "dIsPrepared1", "dIsPrepared2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIs30m()), "dIs30m1", "dIs30m2");
+        getCheck(params, checkParam(tPermitWorkHigh.getdIsOtherMeasure()), "dIsOtherMeasure1", "dIsOtherMeasure2");
+        getCheck(params, checkParam(tPermitWorkHigh.getfIsAfterWorkSafe()), "fIsAfterWorkSafe1", "fIsAfterWorkSafe2");
+        getCheck(params, checkParam(tPermitWorkHigh.getgIsSpecialAssessment()), "gIsSpecialAssessment1", "gIsSpecialAssessment2");
         //endregion
         return params;
     }

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

@@ -192,7 +192,7 @@
                     <tr>
                       <td colspan="3" class="short-checkbox">
                         <el-row>
-                          <el-col :span="3">是否有GHS标识
+                          <el-col :span="3">是否有GHS标识<br>
                             <el-checkbox v-model="form.cIsGhs" true-label="1"/>
                             是
                             <el-checkbox v-model="form.cIsGhs" true-label="2"/>
@@ -386,7 +386,7 @@
                         <el-checkbox v-model="form.dIsOpenSafe" true-label="2" @change="dIsOpenSafeChange"/>
                       </td>
                       <td>
-                        <el-input style="width: 50%" v-model="form.dSafeImplSign11" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%" v-model="form.dSafeImplSign11" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <!--                      <el-button type="primary" slot="append"-->
@@ -399,8 +399,8 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 50%;" prefix-icon="el-icon-edit"/>
-                        <el-date-picker style="width: 50%;"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeLiftedSign11"/>
+                        <el-date-picker style="width: 50%;" v-model="form.dSafeLiftedDate11"
                                         type="date">
                         </el-date-picker>
                       </td>
@@ -424,21 +424,21 @@
                         />
                       </td>
                       <td rowspan="4">
-                        <el-input style="width: 50%;" v-model="form.dDisFeederImplSign" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign12"
                                   prefix-icon="el-icon-edit"
-                                  @focus="signCard('dDisFeederImplSign')">
+                        >
                         </el-input>
-                        <el-date-picker style="width: 50%" v-model="form.dDisFeederImplDate" type="date"
+                        <el-date-picker style="width: 50%" v-model="form.dSafeImplDate12" type="date"
                                         format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss"
                         >
                         </el-date-picker>
                       </td>
                       <td rowspan="4">
-                        <el-input style="width: 50%" v-model="form.dDisFeederLiftedSign" prefix-icon="el-icon-edit"/>
+                        <el-input style="width: 50%" v-model="form.dSafeLiftedSign12" prefix-icon="el-icon-edit"/>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                        v-model="form.dDisFeederLiftedDate" type="date">
+                                        v-model="form.dSafeLiftedDate12" type="date">
                         </el-date-picker>
                       </td>
                     </tr>
@@ -486,9 +486,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign13" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign13"
 
-                                  @focus="signCard('dSafeImplSign13')" prefix-icon="el-icon-edit">
+                                  prefix-icon="el-icon-edit">
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -519,9 +519,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width:50%;" v-model="form.dSafeImplSign14" readonly
+                        <el-input style="width:50%;" v-model="form.dSafeImplSign14"
                                   prefix-icon="el-icon-edit"
-                                  @focus="signCard('dSafeImplSign14')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -552,7 +552,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign21" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign21" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -576,9 +576,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign22" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign22"
                                   prefix-icon="el-icon-edit"
-                                  @focus="signCard('dSafeImplSign22')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -606,9 +606,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign23" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign23"
                                   prefix-icon="el-icon-edit"
-                                  @focus="signCard('dSafeImplSign23')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -640,9 +640,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign24" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign24" prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign24')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -670,9 +670,9 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign25" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign25" prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign25')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -700,7 +700,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign26" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign26" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -729,9 +729,9 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign27" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign27" prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign27')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -762,7 +762,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign28" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign28" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -791,9 +791,9 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign29" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign29" prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign29')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -818,10 +818,10 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign210" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign210"
                                   prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign210')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -851,7 +851,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%" v-model="form.dSafeImplSign31" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%" v-model="form.dSafeImplSign31" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -863,7 +863,7 @@
                       <td></td>
                     </tr>
                     <tr>
-                      <td>3.1 用
+                      <td>3.2 用
                         <el-select style="width: 150px;" clearable v-model="form.dCleanContent" filterable
                         >
                           <el-option v-for="item in dClears" :key="item.id" :label="item.name" :value="item.id">
@@ -880,7 +880,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign32" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign32" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -893,7 +893,7 @@
                       </td>
                     </tr>
                     <tr>
-                      <td>3.2 用
+                      <td>3.3 用
                         <el-select style="width: 150px;" clearable v-model="form.dFlushContent" filterable
                         >
                           <el-option v-for="item in dFlushs" :key="item.id" :label="item.name" :value="item.id">
@@ -910,7 +910,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign33" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign33" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -937,9 +937,9 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign34" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign34" prefix-icon="el-icon-edit"
 
-                                  @focus="signCard('dSafeImplSign34')">
+                        >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
@@ -962,20 +962,20 @@
                         <el-checkbox v-model="form.dIsSiteDemarcation" true-label="2"/>
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign11" prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign41" prefix-icon="el-icon-edit"
                         />
                         <el-date-picker
                           style="width: 50%;"
-                          v-model="form.dSafeImplDate11"
+                          v-model="form.dSafeImplDate41"
                           type="date">
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign11" prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign41" prefix-icon="el-icon-edit"
                         />
                         <el-date-picker
                           style="width: 50%;"
-                          v-model="form.dSafeLiftedDate11"
+                          v-model="form.dSafeLiftedDate41"
                           type="date">
                         </el-date-picker>
                       </td>
@@ -995,7 +995,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign42" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign42" prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -1023,38 +1023,38 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign12" prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign43" prefix-icon="el-icon-edit"
                         />
                         <el-date-picker
                           style="width: 50%;"
-                          v-model="form.dSafeImplDate12"
+                          v-model="form.dSafeImplDate43"
                           type="date">
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign12" prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign43" prefix-icon="el-icon-edit"
                         />
                         <el-date-picker
                           style="width: 50%;"
-                          v-model="form.dSafeLiftedDate12"
+                          v-model="form.dSafeLiftedDate43"
                           type="date">
                         </el-date-picker>
                       </td>
                     </tr>
                     <tr>
                       <td>4.4 对邻近排放口/泄放口等采取的安全措施
-                        <el-input style="width: calc(100% - 250px)"/>
+                        <el-input style="width: calc(100% - 250px)" v-model="form.dLeakDrainContent"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="1"/>
+                        <el-checkbox true-label="1" v-model="form.dIsLeakDrain"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="2"/>
+                        <el-checkbox true-label="2" v-model="form.dIsLeakDrain"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" prefix-icon="el-icon-edit">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign44">
                         </el-input>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate44"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1063,86 +1063,84 @@
                     </tr>
                     <tr>
                       <td>4.5 额外的照明措施：
-                        <el-input style="width: calc(100% - 130px)"/>
+                        <el-input style="width: calc(100% - 130px)" v-model="form.dOtherLightContent"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="1"/>
+                        <el-checkbox true-label="1" v-model="form.dIsOtherLight"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="2"/>
+                        <el-checkbox true-label="2" v-model="form.dIsOtherLight"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" prefix-icon="el-icon-edit">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign45">
                         </el-input>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate45"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
                       <td style="text-align: center;">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeLiftedSign45">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeLiftedDate45"
+                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
+                        </el-date-picker>
                       </td>
                     </tr>
                     <tr>
                       <td>4.6 邻近受影响单位
-                        <el-input style="width: 100px"/>
+                        <el-input style="width: 100px" v-model="form.dEffectUnit"/>
                         负责人签名
-                        <el-input prefix-icon="el-icon-edit" style="width: calc(100% - 290px)"/>
+                        <el-input prefix-icon="el-icon-edit" style="width: calc(100% - 290px)"
+                                  v-model="form.dEffectLeader"/>
                         措施
-                        <el-input style="width: calc(100% - 31px)"/>
+                        <el-input style="width: calc(100% - 31px)" v-model="form.dEffectMeasure"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="1"/>
+                        <el-checkbox true-label="1" v-model="form.dIsEffect"/>
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox true-label="2"/>
+                        <el-checkbox true-label="2" v-model="form.dIsEffect"/>
                       </td>
                       <td>
-                        <el-input style="width:50%;" prefix-icon="el-icon-edit">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign46">
                         </el-input>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
-                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%">
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate46"
+                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 50%" prefix-icon="el-icon-edit"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
-                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                        type="date">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeLiftedSign46">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeLiftedDate46"
+                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
                     </tr>
                     <tr>
                       <td>4.7
-                        <el-input style="width: calc(100% - 23px);" v-model="form.dOtherWorkSafeContent"
+                        <el-input style="width: calc(100% - 23px);" v-model="form.dOtherSafeContent"
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox v-model="form.dIsOtherWorkSafe" true-label="1"
+                        <el-checkbox v-model="form.dIsOtherSafe" true-label="1"
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-checkbox v-model="form.dIsOtherWorkSafe" true-label="2"
-                                     @change="dIsOtherWorkSafeChange"
+                        <el-checkbox v-model="form.dIsOtherSafe" true-label="2"
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign45" readonly prefix-icon="el-icon-edit"
-
-                                  @focus="signCard('dSafeImplSign45')">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign47">
                         </el-input>
-                        <!--<el-button type="primary" slot="append" @click="signCard('dSafeImplSign45')"
-                                   icon="el-icon-edit"
-                                   ></el-button>-->
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
-                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                        v-model="form.dSafeImplDate45" type="date"
-                        >
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate47"
+                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeLiftedSign45"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
-                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                        v-model="form.dSafeLiftedDate45" type="date">
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeLiftedSign47">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeLiftedDate47"
+                                        value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
                     </tr>
@@ -1168,8 +1166,9 @@
                       </td>
                       <td style="text-align: center"></td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign51">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate51"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1177,22 +1176,23 @@
                     </tr>
                     <tr>
                       <td class="short-checkbox">5.2 现场搭设的
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsScaffold" true-label="1"/>
                         脚手架
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsProtectionNet" true-label="1"/>
                         防护网
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsFence" true-label="1"/>
                         围栏符合安全规定
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsScene" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsScene" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign52">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate52"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1200,20 +1200,21 @@
                     </tr>
                     <tr>
                       <td class="short-checkbox">5.3 架设的
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsSafetyRope" true-label="1"/>
                         生命绳
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsFaller" true-label="1"/>
                         防坠器符合安全规定
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsSafetyRegulations" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsSafetyRegulations" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign53">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate53"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1222,14 +1223,15 @@
                     <tr>
                       <td>5.4 若为垂直分层作业，中间要设置隔离设施</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsLamination" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsLamination" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign54">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate54"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1238,14 +1240,15 @@
                     <tr>
                       <td>5.5 轻型棚的承重梁、柱能承重符合的要求</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsLightShed" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsLightShed" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign55">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate55"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1254,14 +1257,15 @@
                     <tr>
                       <td>5.6 作业人员在不承重作业面上所搭设的承重板稳定牢固</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsSecure" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsSecure" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign56">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate56"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1270,14 +1274,15 @@
                     <tr>
                       <td>5.7 准备的梯子、绳子、移动式登高平台符合安全规定</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsPrepared" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsPrepared" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign57">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate57"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1286,14 +1291,15 @@
                     <tr>
                       <td>5.8 30米以上高处作业配备通讯、联络工具</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIs30m" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIs30m" true-label="2"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign58">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate58"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1301,17 +1307,18 @@
                     </tr>
                     <tr>
                       <td class="short-checkbox">5.9
-                        <el-input style="width: calc(100% - 22px)"/>
+                        <el-input style="width: calc(100% - 22px)" v-model="form.dOtherMeasureContent"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsOtherMeasure" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.dIsOtherMeasure" true-label="1"/>
                       </td>
                       <td>
-                        <el-input prefix-icon="el-icon-edit" style="width: 50%"/>
-                        <el-date-picker format="yyyy-MM-dd HH:mm:ss"
+                        <el-input style="width: 50%;" prefix-icon="el-icon-edit" v-model="form.dSafeImplSign59">
+                        </el-input>
+                        <el-date-picker format="yyyy-MM-dd HH:mm:ss" v-model="form.dSafeImplDate59"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%" type="date">
                         </el-date-picker>
                       </td>
@@ -1326,10 +1333,11 @@
                         </el-checkbox>
                         参与交底人签名/日期：
                         <div style="width: calc(100% - 179px);display: inline-block">
-                          <el-input style="width: 50%" placeholder="签名" prefix-icon="el-icon-edit"></el-input>
+                          <el-input style="width: 50%" placeholder="签名" prefix-icon="el-icon-edit"
+                                    v-model="form.dPartakeBriefingSign"></el-input>
                           <el-date-picker
                             style="width: 50%;"
-                            v-model="form.dPartakeBriefingSign"
+                            v-model="form.dPartakeBriefingDate"
                             type="date">
                           </el-date-picker>
                         </div>
@@ -1512,9 +1520,9 @@
                                       v-model="form.eSafeAttendant"
                             />
                             /
-                            <el-input style="width: calc(50% - 79px)" v-model="form.eSafeAttendantSign" readonly
+                            <el-input style="width: calc(50% - 79px)" v-model="form.eSafeAttendantSign"
                                       prefix-icon="el-icon-edit"
-                                      @focus="signCard('eSafeAttendantSign')"/>
+                            />
                           </td>
                           <td style="text-align: center;">
                           </td>
@@ -1675,10 +1683,10 @@
                     <tr>
                       <td>1.将作业情况通知D4.6 受影响单位。</td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.fIsAfterWorkSafe" true-label="1"/>
                       </td>
                       <td style="text-align: center">
-                        <el-checkbox/>
+                        <el-checkbox v-model="form.fIsAfterWorkSafe" true-label="2"/>
                       </td>
                     </tr>
                     <tr>
@@ -1687,11 +1695,10 @@
                         />
                       </td>
                       <td style="width: 30px; text-align: center;">
-                        <el-checkbox v-model="form.fIsAfterWorkSafe" true-label="1"/>
+                        <el-checkbox v-model="form.fIsOtherMeasure" true-label="1"/>
                       </td>
                       <td style="width: 30px; text-align: center;">
-                        <el-checkbox v-model="form.fIsAfterWorkSafe" true-label="2"
-                                     @change="fIsAfterWorkSafeChange"/>
+                        <el-checkbox v-model="form.fIsOtherMeasure" true-label="2"/>
                       </td>
                     </tr>
                   </table>
@@ -1759,8 +1766,8 @@
                         </el-date-picker>
                       </td>
                       <td>A4栏安全联络员签名：
-                        <el-input style="width: 130px;" prefix-icon="el-icon-edit"/>
-                        <el-date-picker
+                        <el-input style="width: 130px;" prefix-icon="el-icon-edit" v-model="form.hSafeMesA4Sign"/>
+                        <el-date-picker v-model="form.hSafeMesA4Date"
                           style="width: calc(100% - 272px)"
                           type="datetime"
                           placeholder="选择日期时间">
@@ -1814,8 +1821,8 @@
                   <table>
                     <tr>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jOneBSign" readonly
-                                  @focus="signCard('jOneBSign')">
+                        <el-input style="width: 100px;" v-model="form.jOneBSign"
+                        >
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -1825,8 +1832,8 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jResMemberSign" readonly
-                                  @focus="signCard('jResMemberSign')">
+                        <el-input style="width: 100px;" v-model="form.jResMemberSign"
+                        >
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -1835,7 +1842,7 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jEISign" readonly @focus="signCard('jEISign')">
+                        <el-input style="width: 100px;" v-model="form.jEISign">
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -2134,6 +2141,7 @@ export default {
     };
     return {
       aConstructions: [],
+      matterNames: [],
       aConstructionsQuery: {
         parentId: 500
       },
@@ -2397,7 +2405,7 @@ export default {
           this.$set(this.value1, 1, response.data.bValidityEndTime);
         }
         if (this.form.cHarmMatterName) {
-          this.form.isYesDanger = '1';
+          this.form.isYesDanger = "1";
         }
         this.msgSuccess(this.$t('数据加载成功'));
       });
@@ -2437,6 +2445,45 @@ export default {
     }
   },
   methods: {
+    selectChange(id) {
+      //清空取消数据选中时清除选中的危害及防护用品
+      if (this.form.cHarmMatterName == null || this.form.cHarmMatterName == '') {
+        this.form.cIsGhs = "2";
+        this.form.isYesDanger = "0";
+      }
+      /* 取消所有危害选中框 */
+      this.falseCheckbox();
+      // 取消所有防护用品选中
+      this.falseProtect();
+      /* 根据危害物质进行动态多选框选中 */
+      // this.$nextTick(() => {
+      this.matterNames.forEach(mf => {
+        if (mf.matterName == id) {
+          var ff = mf.matterFeatureList;
+          var pro = mf.protects;
+          if (ff != null && ff.length > 0) {
+            this.trueCheckbox(ff);
+            this.form.cIsGhs = "1";
+            this.form.isYesDanger = "1";
+          } else {
+            console.log("没有需要选中的多选框");
+          }
+          //2022年1月5日取消防护用品自动选中
+          if (pro != null && pro.length > 0) {
+            pro.forEach(p => {
+              this.form[p.conservatoryMeasureCode] = "1";
+              if (p.conservatoryMeasureContent != null) {
+                console.log(p.conservatoryMeasureContent);
+                console.log(p.conservatoryMeasureName);
+                this.form[p.conservatoryMeasureContent] = p.conservatoryMeasureName;
+              }
+            })
+          }
+        }
+      })
+      console.log(id);
+      // });
+    },
     handleSee() {
       if (!this.form.pdfUrl) {
         return
@@ -2504,15 +2551,15 @@ export default {
       this.form.bValidityEndTime = this.value1[1] == null ? null : this.value1[1];
     },
     falseCheckbox() {
-      this.cIsToxic = null;
-      this.cIsFlammable = null;
-      this.cIsOxidizing = null;
-      this.cIsExplosive = null;
-      this.cIsCorrosive = null;
-      this.cIsIrritantToxic = null;
-      this.cIsHealthHazard = null;
-      this.cIsCompressedGas = null;
-      this.cIsEnvironmentalHazard = null;
+      this.form.cIsToxic = null;
+      this.form.cIsFlammable = null;
+      this.form.cIsOxidizing = null;
+      this.form.cIsExplosive = null;
+      this.form.cIsCorrosive = null;
+      this.form.cIsIrritantToxic = null;
+      this.form.cIsHealthHazard = null;
+      this.form.cIsCompressedGas = null;
+      this.form.cIsEnvironmentalHazard = null;
     },
     queryMatters() {
       listMatters().then(response => {
@@ -2522,23 +2569,23 @@ export default {
     },
     // 取消所有防护用品选中
     falseProtect() {
-      this.eIsSafeGoggles = "0";
-      this.eIsFaceShield = "0";
-      this.eIsProtectGloves = "0";
-      this.eProtectGlovesContent = null;
-      this.eIsRubberBoots = "0";
-      this.eIsRubberApron = "0";
-      this.eIsProtectSuit = "0";
-      this.eProtectSuitContent = null;
-      this.eIsResProtect = "0";
-      this.eResProtectContent = null;
-      this.eIsFallArrest = "0";
-      this.eFallArrestContent = null;
+      this.form.eIsSafeGoggles = "0";
+      this.form.eIsFaceShield = "0";
+      this.form.eIsProtectGloves = "0";
+      this.form.eProtectGlovesContent = null;
+      this.form.eIsRubberBoots = "0";
+      this.form.eIsRubberApron = "0";
+      this.form.eIsProtectSuit = "0";
+      this.form.eProtectSuitContent = null;
+      this.form.eIsResProtect = "0";
+      this.form.eResProtectContent = null;
+      this.form.eIsFallArrest = "0";
+      this.form.eFallArrestContent = null;
     },
     /* 为多选框进行动态选择*/
     trueCheckbox(arr) {
       arr.forEach((m) => {
-        this[m] = true;
+        this.form[m] = "1";
       })
     },
     //施工单位后台数据联动