Merge branch 'master' of http://47.114.101.16:7070/ssy/jobticket

master/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -73,7 +73,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     public static final String parseDateToStr(final String format, final Date date)
     {
-        return new SimpleDateFormat(format).format(date);
+        return date == null ? "" : new SimpleDateFormat(format).format(date);
     }
 
     public static final Date dateTime(final String format, final String ts)

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

@@ -274,6 +274,7 @@ public class TPermitFireWorkController extends BaseController {
         params.put("dProInertGasContent", Texts.of(checkParam(tPermitFireWork.getdProInertGasContent())).fontSize(7).bold().create());
         getCheck(params, checkParam(tPermitFireWork.getdIsGasAnalysis()), "dIsGasAnalysis1", "dIsGasAnalysis2");
         params.put("dGasAnalysisContent", Texts.of(checkParam(tPermitFireWork.getdGasAnalysisContent())).fontSize(7).bold().create());
+        params.put("dOtherDevSafeContent", Texts.of(checkParam(tPermitFireWork.getdOtherDevSafeContent())).fontSize(7).bold().create());
         getCheck(params, checkParam(tPermitFireWork.getdIsOtherDevSafe()), "dIsOtherDevSafe1", "dIsOtherDevSafe2");
         getCheck(params, checkParam(tPermitFireWork.getdIsSiteDemarcation()), "dIsSiteDemarcation1", "dIsSiteDemarcation2");
         params.put("dSiteDemarcationContent", Texts.of(checkParam(tPermitFireWork.getdSiteDemarcationContent())).fontSize(7).bold().create());
@@ -290,7 +291,135 @@ public class TPermitFireWorkController extends BaseController {
         getCheck(params, checkParam(tPermitFireWork.getdIsOtherAreaSafe()), "dIsOtherAreaSafe1", "dIsOtherAreaSafe2");
         getCheck(params, checkParam(tPermitFireWork.getdIsAlarmSystems()), "dIsAlarmSystems1", "dIsAlarmSystems2");
         getCheck(params, checkParam(tPermitFireWork.getdIsOtherMeasure()), "dIsOtherMeasure1", "dIsOtherMeasure2");
-        // TODO: 2023-05-11 4.7以后的横线内容及所有的签字/日期
+        params.put("dNaturalVenContent", Texts.of(checkParam(tPermitFireWork.getdNaturalVenContent())).fontSize(7).bold().create());
+        params.put("dMecVenContent", Texts.of(checkParam(tPermitFireWork.getdMecVenContent())).fontSize(7).bold().create());
+        params.put("dGasDetectionContent", Texts.of(checkParam(tPermitFireWork.getdGasDetectionContent())).fontSize(7).bold().create());
+        params.put("dOtherAreaSafeContent", Texts.of(checkParam(tPermitFireWork.getdOtherAreaSafeContent())).fontSize(7).bold().create());
+        params.put("dAlarmSystemsContent", Texts.of(checkParam(tPermitFireWork.getdAlarmSystemsContent())).fontSize(7).bold().create());
+        params.put("dOtherMeasureContent", Texts.of(checkParam(tPermitFireWork.getdOtherMeasureContent())).fontSize(7).bold().create());
+        params.put("dDangerArea61", Texts.of(checkParam(tPermitFireWork.getdDangerArea61())).fontSize(7).bold().create());
+        params.put("dDangerArea62", Texts.of(checkParam(tPermitFireWork.getdDangerArea62())).fontSize(7).bold().create());
+        params.put("dDangerLeader61", Texts.of(checkParam(tPermitFireWork.getdDangerLeader61())).fontSize(7).bold().create());
+        params.put("dDangerLeaderDate61", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getdDangerLeaderDate61())).fontSize(7).bold().create());
+        params.put("dDangerOffice61", Texts.of(checkParam(tPermitFireWork.getdDangerOffice61())).fontSize(7).bold().create());
+        params.put("dDangerOfficeTel61", Texts.of(checkParam(tPermitFireWork.getdDangerOfficeTel61())).fontSize(7).bold().create());
+        params.put("dDangerOtherMeasure61", Texts.of(checkParam(tPermitFireWork.getdDangerOtherMeasure61())).fontSize(7).bold().create());
+        params.put("dDangerLeader62", Texts.of(checkParam(tPermitFireWork.getdDangerLeader62())).fontSize(7).bold().create());
+        params.put("dDangerLeaderDate62", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getdDangerLeaderDate62())).fontSize(7).bold().create());
+        params.put("dDangerOffice62", Texts.of(checkParam(tPermitFireWork.getdDangerOffice62())).fontSize(7).bold().create());
+        params.put("dDangerOfficeTel62", Texts.of(checkParam(tPermitFireWork.getdDangerOfficeTel62())).fontSize(7).bold().create());
+        params.put("dDangerOtherMeasure62", Texts.of(checkParam(tPermitFireWork.getdDangerOtherMeasure62())).fontSize(7).bold().create());
+        params.put("dPartakeBriefingSign", Texts.of(checkParam(tPermitFireWork.getdPartakeBriefingSign())).fontSize(7).bold().create());
+        params.put("dPartakeBriefingDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getdPartakeBriefingDate())).fontSize(7).bold().create());
+        params.put("dSafeImplSign11", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign11())).fontSize(7).bold().create());
+        params.put("dSafeImplDate11", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate11())).fontSize(7).bold().create());
+        params.put("dSafeImplSign12", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign12())).fontSize(7).bold().create());
+        params.put("dSafeImplDate12", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate12())).fontSize(7).bold().create());
+        params.put("dSafeImplSign21", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign21())).fontSize(7).bold().create());
+        params.put("dSafeImplDate21", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate21())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign21", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign21())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate21", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate21())).fontSize(7).bold().create());
+        params.put("dSafeImplSign22", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign22())).fontSize(7).bold().create());
+        params.put("dSafeImplDate22", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate22())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign22", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign22())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate22", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate22())).fontSize(7).bold().create());
+        params.put("dSafeImplSign23", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign23())).fontSize(7).bold().create());
+        params.put("dSafeImplDate23", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate23())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign23", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign23())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate23", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate23())).fontSize(7).bold().create());
+        params.put("dSafeImplSign24", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign24())).fontSize(7).bold().create());
+        params.put("dSafeImplDate24", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate24())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign24", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign24())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate24", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate24())).fontSize(7).bold().create());
+        params.put("dSafeImplSign31", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign31())).fontSize(7).bold().create());
+        params.put("dSafeImplDate31", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate31())).fontSize(7).bold().create());
+        params.put("dSafeImplSign32", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign32())).fontSize(7).bold().create());
+        params.put("dSafeImplDate32", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate32())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign32", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign32())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate32", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate32())).fontSize(7).bold().create());
+        params.put("dSafeImplDate33", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate33())).fontSize(7).bold().create());
+        params.put("dSafeImplSign33", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign33())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign33", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign33())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate33", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate33())).fontSize(7).bold().create());
+        params.put("dSafeImplDate34", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate34())).fontSize(7).bold().create());
+        params.put("dSafeImplSign34", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign34())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign34", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign34())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate34", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate34())).fontSize(7).bold().create());
+        params.put("dSafeImplDate35", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate35())).fontSize(7).bold().create());
+        params.put("dSafeImplSign35", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign35())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign35", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign35())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate35", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate35())).fontSize(7).bold().create());
+        params.put("dSafeImplDate36", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate36())).fontSize(7).bold().create());
+        params.put("dSafeImplSign36", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign36())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign36", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign36())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate36", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate36())).fontSize(7).bold().create());
+        params.put("dSafeImplDate37", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate37())).fontSize(7).bold().create());
+        params.put("dSafeImplSign37", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign37())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign37", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign37())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate37", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate37())).fontSize(7).bold().create());
+        params.put("dSafeImplDate38", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate38())).fontSize(7).bold().create());
+        params.put("dSafeImplSign38", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign38())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign38", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign38())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate38", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate38())).fontSize(7).bold().create());
+        params.put("dSafeImplDate39", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate39())).fontSize(7).bold().create());
+        params.put("dSafeImplSign39", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign39())).fontSize(7).bold().create());
+        params.put("dSafeImplDate310", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate310())).fontSize(7).bold().create());
+        params.put("dSafeImplSign310", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign310())).fontSize(7).bold().create());
+        params.put("dSafeImplDate311", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate311())).fontSize(7).bold().create());
+        params.put("dSafeImplSign311", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign311())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign311", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign311())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate311", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate311())).fontSize(7).bold().create());
+        params.put("dSafeImplDate312", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate312())).fontSize(7).bold().create());
+        params.put("dSafeImplSign312", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign312())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign312", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign312())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate312", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate312())).fontSize(7).bold().create());
+        params.put("dSafeImplDate313", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate313())).fontSize(7).bold().create());
+        params.put("dSafeImplSign313", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign313())).fontSize(7).bold().create());
+        params.put("dSafeImplDate314", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate314())).fontSize(7).bold().create());
+        params.put("dSafeImplSign314", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign314())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign314", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign314())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate314", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate314())).fontSize(7).bold().create());
+        params.put("dSafeImplSign41", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign41())).fontSize(7).bold().create());
+        params.put("dSafeImplDate41", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate41())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign41", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign41())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate41", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate41())).fontSize(7).bold().create());
+        params.put("dSafeImplSign42", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign42())).fontSize(7).bold().create());
+        params.put("dSafeImplDate42", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate42())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign42", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign42())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate42", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate42())).fontSize(7).bold().create());
+        params.put("dSafeImplSign43", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign43())).fontSize(7).bold().create());
+        params.put("dSafeImplDate43", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate43())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign44", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign44())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate44", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate44())).fontSize(7).bold().create());
+        params.put("dSafeImplSign44", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign44())).fontSize(7).bold().create());
+        params.put("dSafeImplDate44", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate44())).fontSize(7).bold().create());
+        params.put("dSafeImplSign45", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign45())).fontSize(7).bold().create());
+        params.put("dSafeImplDate45", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate45())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign45", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign45())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate45", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate45())).fontSize(7).bold().create());
+        params.put("dSafeImplSign46", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign46())).fontSize(7).bold().create());
+        params.put("dSafeImplDate46", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate46())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign46", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign46())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate46", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate46())).fontSize(7).bold().create());
+        params.put("dSafeImplSign47", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign47())).fontSize(7).bold().create());
+        params.put("dSafeImplDate47", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate47())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign47", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign47())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate47", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate47())).fontSize(7).bold().create());
+        params.put("dSafeImplSign48", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign48())).fontSize(7).bold().create());
+        params.put("dSafeImplDate48", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate48())).fontSize(7).bold().create());
+        params.put("dSafeImplSign49", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign49())).fontSize(7).bold().create());
+        params.put("dSafeImplDate49", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate49())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign49", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign49())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate49", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate49())).fontSize(7).bold().create());
+        params.put("dSafeImplSign51", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign51())).fontSize(7).bold().create());
+        params.put("dSafeImplDate51", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate51())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign51", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign51())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate51", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate51())).fontSize(7).bold().create());
+        params.put("dSafeImplSign52", Texts.of(checkParam(tPermitFireWork.getdSafeImplSign52())).fontSize(7).bold().create());
+        params.put("dSafeImplDate52", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeImplDate52())).fontSize(7).bold().create());
+        params.put("dSafeLiftedSign52", Texts.of(checkParam(tPermitFireWork.getdSafeLiftedSign52())).fontSize(7).bold().create());
+        params.put("dSafeLiftedDate52", Texts.of(DateUtils.parseDateToStr("yyyy-MM-dd",tPermitFireWork.getdSafeLiftedDate52())).fontSize(7).bold().create());
+
         //E栏
         getCheck(params, checkParam(tPermitFireWork.geteIsPresent()), "eIsPresent1", "eIsPresent2");
         getCheck(params, checkParam(tPermitFireWork.geteIsRequiredPpe()), "eIsRequiredPpe1", "eIsRequiredPpe2");
@@ -321,6 +450,77 @@ public class TPermitFireWorkController extends BaseController {
         getCheck(params, checkParam(tPermitFireWork.geteIsVentilate()), "eIsVentilate1", "eIsVentilate2");
         getCheck(params, checkParam(tPermitFireWork.geteIsExxtractDust()), "eIsExxtractDust1", "eIsExxtractDust2");
         getCheck(params, checkParam(tPermitFireWork.geteIsAnalyzeAir()), "eIsAnalyzeAir1", "eIsAnalyzeAir2");
+        params.put("ePpeContent", Texts.of(checkParam(tPermitFireWork.getePpeContent())).fontSize(7).bold().create());
+        params.put("eOther21Content", Texts.of(checkParam(tPermitFireWork.geteOther21Content())).fontSize(7).bold().create());
+        params.put("eProtectGlovesContent", Texts.of(checkParam(tPermitFireWork.geteProtectGlovesContent())).fontSize(7).bold().create());
+        params.put("eIsOther23Content", Texts.of(checkParam(tPermitFireWork.geteIsOther23Content())).fontSize(7).bold().create());
+        params.put("eProtectSuitContent", Texts.of(checkParam(tPermitFireWork.geteProtectSuitContent())).fontSize(7).bold().create());
+        params.put("eResProtectContent", Texts.of(checkParam(tPermitFireWork.geteResProtectContent())).fontSize(7).bold().create());
+        params.put("eHearProtectContent", Texts.of(checkParam(tPermitFireWork.geteHearProtectContent())).fontSize(7).bold().create());
+        params.put("eFallArrestContent", Texts.of(checkParam(tPermitFireWork.geteFallArrestContent())).fontSize(7).bold().create());
+        params.put("eOtherProtectContent", Texts.of(checkParam(tPermitFireWork.geteOtherProtectContent())).fontSize(7).bold().create());
+        params.put("eFireExtNum", Texts.of(checkParam(tPermitFireWork.geteFireExtNum())).fontSize(7).bold().create());
+        params.put("eFireExtType", Texts.of(checkParam(tPermitFireWork.geteFireExtType())).fontSize(7).bold().create());
+        params.put("eLeaderUnit", Texts.of(checkParam(tPermitFireWork.geteLeaderUnit())).fontSize(7).bold().create());
+        params.put("eLeaderName", Texts.of(checkParam(tPermitFireWork.geteLeaderName())).fontSize(7).bold().create());
+        params.put("eMecVenContent", Texts.of(checkParam(tPermitFireWork.geteMecVenContent())).fontSize(7).bold().create());
+        params.put("eNaturalVenContent", Texts.of(checkParam(tPermitFireWork.geteNaturalVenContent())).fontSize(7).bold().create());
+        params.put("eAnalyzeAirContent", Texts.of(checkParam(tPermitFireWork.geteAnalyzeAirContent())).fontSize(7).bold().create());
+        params.put("eAnalyzeAirInterval", Texts.of(checkParam(tPermitFireWork.geteAnalyzeAirInterval())).fontSize(7).bold().create());
+
+        //F栏
+        getCheck(params, checkParam(tPermitFireWork.getfIsFireEndCheck()), "fIsFireEndCheck1", "fIsFireEndCheck2");
+        getCheck(params, checkParam(tPermitFireWork.getfIsNoticeD()), "fIsNoticeD1", "fIsNoticeD2");
+        getCheck(params, checkParam(tPermitFireWork.getfIsOtherSafeMeasures()), "fIsOtherSafeMeasures1", "fIsOtherSafeMeasures2");
+        params.put("fProfessional", Texts.of(checkParam(tPermitFireWork.getfProfessional())).fontSize(7).bold().create());
+        params.put("fOtherSafeMeasuresContent", Texts.of(checkParam(tPermitFireWork.getfOtherSafeMeasuresContent())).fontSize(7).bold().create());
+
+        //G栏
+        getCheck(params, checkParam(tPermitFireWork.getgIsSpecialAssessment()), "gIsSpecialAssessment1", "gIsSpecialAssessment2");
+        params.put("gSpecialAssessment", Texts.of(checkParam(tPermitFireWork.getgSpecialAssessment())).fontSize(7).bold().create());
+        params.put("gFirstSign", Texts.of(checkParam(tPermitFireWork.getgFirstSign())).fontSize(7).bold().create());
+        params.put("gFirstDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getgFirstDate())).fontSize(7).bold().create());
+        params.put("gSecondSign", Texts.of(checkParam(tPermitFireWork.getgSecondSign())).fontSize(7).bold().create());
+        params.put("gSecondDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getgSecondDate())).fontSize(7).bold().create());
+        params.put("gThirdSign", Texts.of(checkParam(tPermitFireWork.getgThirdSign())).fontSize(7).bold().create());
+        params.put("gThirdDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getgThirdDate())).fontSize(7).bold().create());
+
+        //H栏
+        params.put("hSafeMesSign", Texts.of(checkParam(tPermitFireWork.gethSafeMesSign())).fontSize(7).bold().create());
+        params.put("hSafeMesDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.gethSafeMesDate())).fontSize(7).bold().create());
+        params.put("hSafeMesA4Sign", Texts.of(checkParam(tPermitFireWork.gethSafeMesA4Sign())).fontSize(7).bold().create());
+        params.put("hSafeMesA4Date", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.gethSafeMesA4Date())).fontSize(7).bold().create());
+
+        //I栏
+        params.put("iOneASign", Texts.of(checkParam(tPermitFireWork.getiOneASign())).fontSize(7).bold().create());
+        params.put("iOneADate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getiOneADate())).fontSize(7).bold().create());
+        params.put("iOneBSign", Texts.of(checkParam(tPermitFireWork.getiOneBSign())).fontSize(7).bold().create());
+        params.put("iOneBDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getiOneBDate())).fontSize(7).bold().create());
+
+        //J栏
+        params.put("jOneBSign", Texts.of(checkParam(tPermitFireWork.getjOneBSign())).fontSize(7).bold().create());
+        params.put("jOneBDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getjOneBDate())).fontSize(7).bold().create());
+        params.put("jResMemberSign", Texts.of(checkParam(tPermitFireWork.getjResMemberSign())).fontSize(7).bold().create());
+        params.put("jResMemberDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getjResMemberDate())).fontSize(7).bold().create());
+        params.put("jEISign", Texts.of(checkParam(tPermitFireWork.getjEISign())).fontSize(7).bold().create());
+        params.put("jEIDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getjEIDate())).fontSize(7).bold().create());
+
+        // K栏
+        params.put("kConfirmSign", Texts.of(checkParam(tPermitFireWork.getkConfirmSign())).fontSize(7).bold().create());
+        params.put("kConfirmDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getkConfirmDate())).fontSize(7).bold().create());
+
+        //L栏
+        params.put("lNoticeSign", Texts.of(checkParam(tPermitFireWork.getlNoticeSign())).fontSize(7).bold().create());
+        params.put("lNoticeDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getlNoticeDate())).fontSize(7).bold().create());
+
+        //M栏
+        params.put("mAssessDSign", Texts.of(checkParam(tPermitFireWork.getmAssessDSign())).fontSize(7).bold().create());
+        params.put("mAssessDDate", Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tPermitFireWork.getmAssessDDate())).fontSize(7).bold().create());
+        params.put("mAssessDContent", Texts.of(checkParam(tPermitFireWork.getmAssessDContent())).fontSize(7).bold().create());
+        params.put("mOtherLicenceOne", Texts.of(checkParam(tPermitFireWork.getmOtherLicenceOne())).fontSize(7).bold().create());
+        params.put("mOtherLicenceTwo", Texts.of(checkParam(tPermitFireWork.getmOtherLicenceTwo())).fontSize(7).bold().create());
+        params.put("mOtherLicenceThree", Texts.of(checkParam(tPermitFireWork.getmOtherLicenceThree())).fontSize(7).bold().create());
+
         //endregion
         return params;
     }
@@ -373,6 +573,7 @@ public class TPermitFireWorkController extends BaseController {
             params.put(check3, new TextRenderData("\u006F", new Style("Wingdings", 7)));
         }
     }*/
+
     /**
      * 勾选框判断渲染
      *

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

@@ -409,7 +409,7 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * 2.3是否放射源由专业人员确保安全（日志）
      */
-    @Excel(name = "2.3是否放射源由专业人员确保安全", readConverterExp = "日=志")
+    @Excel(name = "2.3是否放射源由专业人员确保安全（日志）")
     private Long dIsRadioactiveSources;
 
     /**
@@ -692,8 +692,9 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * 6.1负责人签字日期
      */
-    @Excel(name = "6.1负责人签字日期")
-    private String dDangerLeaderDate61;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "6.1负责人签字日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dDangerLeaderDate61;
 
     /**
      * 6.1办公室
@@ -728,8 +729,9 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * 6.2负责人签字日期
      */
-    @Excel(name = "6.2负责人签字日期")
-    private String dDangerLeaderDate62;
+    @Excel(name = "6.2负责人签字日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date dDangerLeaderDate62;
 
     /**
      * 6.2办公室
@@ -1755,37 +1757,37 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * G第一签名（装置/部门授权人员）
      */
-    @Excel(name = "G第一签名", readConverterExp = "装=置/部门授权人员")
+    @Excel(name = "G第一签名（装置/部门授权人员）")
     private String gFirstSign;
 
     /**
      * G第一签名（装置/部门授权人员）时间
      */
-    @Excel(name = "G第一签名", readConverterExp = "装=置/部门授权人员")
+    @Excel(name = "G第一签名（=置/部门授权人员）")
     private Date gFirstDate;
 
     /**
      * G第二签名（装置/部门授权人员）
      */
-    @Excel(name = "G第二签名", readConverterExp = "装=置/部门授权人员")
+    @Excel(name = "G第二签名（装置/部门授权人员）")
     private String gSecondSign;
 
     /**
      * G第二签名（装置/部门授权人员）时间
      */
-    @Excel(name = "G第二签名", readConverterExp = "装=置/部门授权人员")
+    @Excel(name = "G第二签名（装置/部门授权人员）")
     private Date gSecondDate;
 
     /**
      * G第三签名（相应部门人员及部门名称）
      */
-    @Excel(name = "G第三签名", readConverterExp = "相=应部门人员及部门名称")
+    @Excel(name = "G第三签名（相=应部门人员及部门名称")
     private String gThirdSign;
 
     /**
      * G第三签名（相应部门人员及部门名称）时间
      */
-    @Excel(name = "G第三签名", readConverterExp = "相=应部门人员及部门名称")
+    @Excel(name = "G第三签名（相=应部门人员及部门名称")
     private Date gThirdDate;
 
     /**
@@ -1829,49 +1831,53 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * I 1a签名（授权的维修主管）
      */
-    @Excel(name = "I 1a签名", readConverterExp = "授=权的维修主管")
+    @Excel(name = "I 1a签名（授权的维修主管）")
     private String iOneASign;
 
     /**
      * I 1a签名（授权的维修主管）时间
      */
-    @Excel(name = "I 1a签名", readConverterExp = "授=权的维修主管")
+    @Excel(name = "I 1a签名（授权的维修主管）")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date iOneADate;
 
     /**
      * I 1b签名（授权的维修工人）
      */
-    @Excel(name = "I 1b签名", readConverterExp = "授=权的维修工人")
+    @Excel(name = "I 1b签名（授权的维修工人）")
     private String iOneBSign;
 
     /**
      * I 1b签名（授权的维修工人）时间
      */
-    @Excel(name = "I 1b签名", readConverterExp = "授=权的维修工人")
+    @Excel(name = "I 1b签名（授权的维修工人）")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date iOneBDate;
 
     /**
      * J1 授权的维修工人签名（I1b）
      */
-    @Excel(name = "J1 授权的维修工人签名", readConverterExp = "I=1b")
+    @Excel(name = "J1 授权的维修工人签名（I1b）")
     private String jOneBSign;
 
     /**
      * J1 授权的维修工人签名（I1b）时间
      */
-    @Excel(name = "J1 授权的维修工人签名", readConverterExp = "I=1b")
+    @Excel(name = "J1 授权的维修工人签名（I1b）")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date jOneBDate;
 
     /**
      * J1 生产装置授权人员签名（G）
      */
-    @Excel(name = "J1 生产装置授权人员签名", readConverterExp = "G=")
+    @Excel(name = "J1 生产装置授权人员签名（G）")
     private String jResMemberSign;
 
     /**
      * J1 生产装置授权人员签名（G）时间
      */
-    @Excel(name = "J1 生产装置授权人员签名", readConverterExp = "G=")
+    @Excel(name = "J1 生产装置授权人员签名（G）")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date jResMemberDate;
 
     /**
@@ -1922,13 +1928,14 @@ public class TPermitFireWork extends BaseEntity {
     /**
      * M 评估/批准撤销D栏的施工安全措施内容签名（生产装置授权人员）
      */
-    @Excel(name = "M 评估/批准撤销D栏的施工安全措施内容签名", readConverterExp = "生=产装置授权人员")
+    @Excel(name = "M 评估/批准撤销D栏的施工安全措施内容签名（生产装置授权人员）")
     private String mAssessDSign;
 
     /**
      * M 评估/批准撤销D栏的施工安全措施内容签名（生产装置授权人员）时间
      */
-    @Excel(name = "M 评估/批准撤销D栏的施工安全措施内容签名", readConverterExp = "生=产装置授权人员")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "M 评估/批准撤销D栏的施工安全措施内容签名（生产装置授权人员）")
     private Date mAssessDDate;
 
     /**
@@ -2865,11 +2872,11 @@ public class TPermitFireWork extends BaseEntity {
         return dDangerLeader61;
     }
 
-    public void setdDangerLeaderDate61(String dDangerLeaderDate61) {
+    public void setdDangerLeaderDate61(Date dDangerLeaderDate61) {
         this.dDangerLeaderDate61 = dDangerLeaderDate61;
     }
 
-    public String getdDangerLeaderDate61() {
+    public Date getdDangerLeaderDate61() {
         return dDangerLeaderDate61;
     }
 
@@ -2913,11 +2920,11 @@ public class TPermitFireWork extends BaseEntity {
         return dDangerLeader62;
     }
 
-    public void setdDangerLeaderDate62(String dDangerLeaderDate62) {
+    public void setdDangerLeaderDate62(Date dDangerLeaderDate62) {
         this.dDangerLeaderDate62 = dDangerLeaderDate62;
     }
 
-    public String getdDangerLeaderDate62() {
+    public Date getdDangerLeaderDate62() {
         return dDangerLeaderDate62;
     }
 

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

@@ -15,17 +15,16 @@
               </td>
               <td>
                 <el-input style="width: 200px;" v-model="form.hId" placeholder="点击生成票据ID" @focus="hIdClick"
-                          :disabled="hIdDisabled"
-                >
+                          :disabled="hIdDisabled">
                   <i slot="prefix" class="el-input__icon el-icon-word">H</i>
                 </el-input>
               </td>
               <td>
-                  <el-button @click="allExpand">全部展开</el-button>
-                  <el-button @click="allShrink">全部关闭</el-button>
-                  <el-button type="primary" v-show="form.hId" @click="onSubmit">提交当前数据</el-button>
-                  <el-button type="success" @click="handleSee">预览</el-button>
-                  <el-button type="success" @click="handleDownload">下载</el-button>
+                <el-button @click="allExpand">全部展开</el-button>
+                <el-button @click="allShrink">全部关闭</el-button>
+                <el-button type="primary" v-show="form.hId" @click="onSubmit">提交当前数据</el-button>
+                <el-button type="success" @click="handleSee">预览</el-button>
+                <el-button type="success" @click="handleDownload">下载</el-button>
               </td>
             </tr>
           </table>
@@ -112,15 +111,13 @@
                           <!--                          </td>-->
                           <td style="white-space: nowrap;">
                             <i class="el-icon-phone"></i>：
-                            <el-input v-model="form.aSafeLiaisonTel"
-                            />
+                            <el-input v-model="form.aSafeLiaisonTel" style="width: 110px"/>
                           </td>
                           <td>
                             办公室：
                           </td>
                           <td>
-                            <el-input v-model="form.aSafeLiaisonOffice"
-                            />
+                            <el-input v-model="form.aSafeLiaisonOffice"/>
                           </td>
                         </tr>
                       </table>
@@ -184,8 +181,11 @@
                     <tr>
                       <td colspan="2" 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"/>
                           </el-col>
                           <el-col :span="2.5" style="text-align: center">
                             <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/toxicIcon.png')">
@@ -415,7 +415,7 @@
                         <el-checkbox v-model="form.dIsOpenSafe" :true-label="2" @change="dIsOpenSafeChange"/>
                       </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>
@@ -454,7 +454,7 @@
                         />
                       </td>
                       <td rowspan="4">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign22" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign22"
                                   prefix-icon="el-icon-edit"
                         >
                         </el-input>
@@ -517,7 +517,7 @@
                         />
                       </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">
                         </el-input>
@@ -551,7 +551,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width:50%;" v-model="form.dSafeImplSign24" readonly
+                        <el-input style="width:50%;" v-model="form.dSafeImplSign24"
 
                                   prefix-icon="el-icon-edit"
                         >
@@ -567,7 +567,7 @@
                         />
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
                                         value-format="yyyy-MM-dd HH:mm:ss" style="width: 50%"
-                                        v-model="form.dSafeLiftedDate14" type="date">
+                                        v-model="form.dSafeLiftedDate24" type="date">
                         </el-date-picker>
                       </td>
                     </tr>
@@ -586,7 +586,7 @@
                         />
                       </td>
                       <td>
-                        <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>
@@ -610,7 +610,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign32" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign32"
 
                                   prefix-icon="el-icon-edit"
                         >
@@ -642,7 +642,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign33" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign33"
 
                                   prefix-icon="el-icon-edit"
                         >
@@ -677,7 +677,7 @@
                         />
                       </td>
                       <td>
-                        <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"
 
                         >
                         </el-input>
@@ -708,7 +708,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign35" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign35"  prefix-icon="el-icon-edit"
 
                         >
                         </el-input>
@@ -739,7 +739,7 @@
                         />
                       </td>
                       <td>
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign36" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign36"  prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -769,7 +769,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign37" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign37"  prefix-icon="el-icon-edit"
 
                         >
                         </el-input>
@@ -803,7 +803,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign38" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign38"  prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -839,7 +839,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign39" readonly prefix-icon="el-icon-edit"
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign39"  prefix-icon="el-icon-edit"
                         >
                         </el-input>
                         <el-date-picker format="yyyy-MM-dd HH:mm:ss"
@@ -869,7 +869,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign310" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign310"
                                   prefix-icon="el-icon-edit"
                         >
                         </el-input>
@@ -961,7 +961,7 @@
                     </tr>
                     <tr>
                       <td>3.14
-                        <el-input style="width: calc(100% - 31px)" v-model="form.dIsOtherDevSafe"
+                        <el-input style="width: calc(100% - 31px)" v-model="form.dOtherDevSafeContent"
                         />
                       </td>
                       <td style="text-align: center;">
@@ -974,7 +974,7 @@
                         />
                       </td>
                       <td style="text-align: center;">
-                        <el-input style="width: 50%;" v-model="form.dSafeImplSign314" readonly
+                        <el-input style="width: 50%;" v-model="form.dSafeImplSign314"
                                   prefix-icon="el-icon-edit"
 
                         >
@@ -986,8 +986,8 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input v-model="form.dSafeLiftedSign312" style="width: 50%;" prefix-icon="el-icon-edit"/>
-                        <el-date-picker style="width: 50%;" v-model="form.dSafeLiftedDate312"
+                        <el-input v-model="form.dSafeLiftedSign314" style="width: 50%;" prefix-icon="el-icon-edit"/>
+                        <el-date-picker style="width: 50%;" v-model="form.dSafeLiftedDate314"
                                         type="date">
                         </el-date-picker>
                       </td>
@@ -1056,7 +1056,7 @@
                     </tr>
                     <tr>
                       <td>4.3 与槽车/储罐的最低距离
-                        <el-input style="width: 150px" v-model="form.dLowTrucksDistance"
+                        <el-input style="width: 150px" v-model="form.dDistanceContent"
                         />
                         米
                       </td>
@@ -1231,7 +1231,7 @@
                     </tr>
                     <tr>
                       <td>5.1 关闭消防/报警系统
-                        <el-input style="width: calc(100% - 130px)"/>
+                        <el-input style="width: calc(100% - 130px)" v-model="form.dAlarmSystemsContent"/>
                       </td>
                       <td style="text-align: center">
                         <el-checkbox v-model="form.dIsAlarmSystems" :true-label="1"
@@ -1309,7 +1309,7 @@
                       </td>
                       <td>
                         <el-input style="width: 50%;" v-model="form.dDangerLeader61" prefix-icon="el-icon-edit"/>
-                        <el-date-picker v-model="dDangerLeaderDate61"
+                        <el-date-picker v-model="form.dDangerLeaderDate61"
                                         style="width: 50%;">
                         </el-date-picker>
                       </td>
@@ -1327,7 +1327,7 @@
                       </td>
                       <td>
                         <el-input style="width: 50%;" v-model="form.dDangerLeader62" prefix-icon="el-icon-edit"/>
-                        <el-date-picker v-model="dDangerLeaderDate62"
+                        <el-date-picker v-model="form.dDangerLeaderDate62"
                                         style="width: 50%;">
                         </el-date-picker>
                       </td>
@@ -1840,7 +1840,7 @@
                   <table>
                     <tr>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jOneBSign" readonly
+                        <el-input style="width: 100px;" v-model="form.jOneBSign"
                         >
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
@@ -1851,7 +1851,7 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jResMemberSign" readonly
+                        <el-input style="width: 100px;" v-model="form.jResMemberSign"
                         >
                           <i slot="prefix" class="el-input__icon el-icon-edit"></i>
                         </el-input>
@@ -1861,7 +1861,7 @@
                         </el-date-picker>
                       </td>
                       <td>
-                        <el-input style="width: 100px;" v-model="form.jEISign" readonly>
+                        <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"
@@ -2158,6 +2158,7 @@ export default {
     return {
       trueLabel: 1,
       aConstructions: [],
+      matterNames: [],
       aConstructionsQuery: {
         parentId: 500
       },
@@ -2461,7 +2462,47 @@ export default {
 
     }
   },
-  methods: {
+  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) {
+            this.form.isYesResidue = true;
+            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
@@ -2523,15 +2564,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 => {
@@ -2541,23 +2582,23 @@ export default {
     },
     // 取消所有防护用品选中
     falseProtect() {
-      this.eIsSafeGoggles = "0";
-      this.eIsFaceShield = "0";
-      this.eIsProtectGloves = "0";
+      this.eIsSafeGoggles = 0;
+      this.eIsFaceShield = 0;
+      this.eIsProtectGloves = 0;
       this.eProtectGlovesContent = null;
-      this.eIsRubberBoots = "0";
-      this.eIsRubberApron = "0";
-      this.eIsProtectSuit = "0";
+      this.eIsRubberBoots = 0;
+      this.eIsRubberApron = 0;
+      this.eIsProtectSuit = 0;
       this.eProtectSuitContent = null;
-      this.eIsResProtect = "0";
+      this.eIsResProtect = 0;
       this.eResProtectContent = null;
-      this.eIsFallArrest = "0";
+      this.eIsFallArrest = 0;
       this.eFallArrestContent = null;
     },
     /* 为多选框进行动态选择*/
     trueCheckbox(arr) {
       arr.forEach((m) => {
-        this[m] = true;
+        this.form[m] = 1;
       })
     },
     //施工单位后台数据联动

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

@@ -45,6 +45,10 @@
               <td>
                 <el-form-item>
                   <el-button v-if="form.pdfUrl" type="success" @click="handleSee">预览</el-button>
+                </el-form-item>
+              </td>
+              <td>
+                <el-form-item>
                   <el-button v-if="form.pdfUrl" type="success" @click="handleDownload">下载</el-button>
                 </el-form-item>
               </td>
@@ -220,12 +224,12 @@
                       </td>
                     </tr>
                     <!-- 图标及物料特性根据物料进行动态展示 -->
-                    <tr style="text-align: center;"  class="short-checkbox">
+                    <tr style="text-align: center;" class="short-checkbox">
                       <td rowspan="2">是否有GHS标识<br>
-                          <el-checkbox v-model="form.cIsGhs" true-label="1"/>
-                          是
-                          <el-checkbox v-model="form.cIsGhs" true-label="2"/>
-                          否
+                        <el-checkbox v-model="form.cIsGhs" true-label="1"/>
+                        是
+                        <el-checkbox v-model="form.cIsGhs" true-label="2"/>
+                        否
                       </td>
                       <td style="width: 80px;">
                         <el-image style="width: 70px;height: 70px;" :src="require('@/assets/image/toxicIcon.png')">