Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -195,6 +195,11 @@ export default {
         }
       }
       var val = this.value;
+      if(mapVal.resultLoadShipDate > new Date()){
+         this.$message.error("装船日期不能大于当前时间！");
+         this.isLoading=false;
+         return;
+      }
       if (
         mapVal.resultActualInstallations == null ||
         mapVal.resultLoadShipDate == null ||

src/views/TMS/components/importedShip/addUnloadShip.vue

@@ -88,6 +88,11 @@ export default {
         this.isLoading = false
         return
       }
+      if(this.form.resultStartTime > new Date()){
+         this.$message.error("卸船开始时间不能大于当前时间！");
+         this.isLoading=false;
+         return;
+      }
       if (
         !this.form.resultArrivalDate ||
         !this.form.resultStartTime ||