diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 7542773e8..86f1e9751 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -1,5 +1,6 @@ package com.jero.modules.project.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -120,6 +121,7 @@ public class ProjectLawsInventoryEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date xin1Che1Xing2Shi2Shi1Ri4Qi1; @TableField(exist = false) private String xin1Che1Xing2Shi2Shi1Ri4Qi1String; @@ -129,6 +131,7 @@ public class ProjectLawsInventoryEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date implementTime; @TableField(exist = false) private String implementTimeString; @@ -240,6 +243,7 @@ public class ProjectLawsInventoryEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "设计符合性确认-截止时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date designDueDate; @TableField(exist = false) private String designDueDateString; @@ -296,6 +300,7 @@ public class ProjectLawsInventoryEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "prehomo确认-截止时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date prehomoDueDate; @TableField(exist = false) private String prehomoDueDateString; @@ -352,6 +357,7 @@ public class ProjectLawsInventoryEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "验证符合性确认-截止时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date verifyDueDate; @TableField(exist = false) private String verifyDueDateString; diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 7aaa049fb..f65bc988f 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -95,6 +95,7 @@ attestationEndTime.valueOf()){ + return true; + } + return endDate < moment(attestationStartTime).add( 'days'); + }, + disabledRegistrationStartDate(StartDate){ + const { attestationStartTime,attestationEndTime } = this.formInline; + if(attestationEndTime && StartDate.valueOf() > attestationEndTime.valueOf()){ + return true; + } + return StartDate > moment(attestationEndTime).add( 'days'); + }, edit() { this.visible = true this.$nextTick(() => {