Merge remote-tracking branch 'origin/master'

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;

jero-web/src/views/projectManagement/components/settingList.vue

@@ -95,6 +95,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="attestationStartTime">
               <a-date-picker class="box-input"
+                             :disabledDate='this.disabledRegistrationStartDate'
                              :placeholder="$t('PleaseSelect')+$t('certificationStart')"
                              @change="dateChange({db_field_name:'attestationStartTime'})"
                              format="YYYY-MM-DD"
@@ -114,6 +115,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="attestationEndTime">
               <a-date-picker class="box-input"
+                             :disabledDate='this.disabledRegistrationEndDate'
                              :placeholder="$t('PleaseSelect')+$t('certificationEnd')"
                              @change="dateChange({db_field_name:'attestationEndTime'})"
                              format="YYYY-MM-DD"
@@ -217,6 +219,20 @@
     mounted() {
     },
     methods: {
+      disabledRegistrationEndDate(endDate){
+        const { attestationStartTime,attestationEndTime } = this.formInline;
+        if(attestationEndTime && endDate.valueOf() > 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(() => {