Merge remote-tracking branch 'origin/master'

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(() => {