Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui.git into dev

src/views/kaihe/singleVoyageShip/index.vue

@@ -410,7 +410,8 @@ export default {
     },
     // 离港出运
     departureShipment() {
-      if (this.ship[0].fArrivalStatus === 0) {
+      console.log(this.ship)
+      // if (this.ship[0].fArrivalStatus === 0) {
         if (this.departure === null) {
           this.$message({
             showClose: true,
@@ -435,17 +436,18 @@ export default {
             });
           })
         }
-      }else {
-        this.$message({
-          showClose: true,
-          message: '该航次已离港或已到港',
-          type: 'warning'
-        });
-      }
+      // }
+      // else {
+      //   this.$message({
+      //     showClose: true,
+      //     message: '该航次已离港或已到港',
+      //     type: 'warning'
+      //   });
+      // }
     },
     // 到港卸船
     unloading() {
-      if (this.ship[0].fArrivalStatus === 1) {
+      // if (this.ship[0].fArrivalStatus === 1) {
         if (this.arrival === null) {
           this.$message({
             showClose: true,
@@ -470,13 +472,13 @@ export default {
             });
           })
         }
-      } else {
-        this.$message({
-          showClose: true,
-          message: '该航次未离港或已到港',
-          type: 'warning'
-        });
-      }
+      // } else {
+      //   this.$message({
+      //     showClose: true,
+      //     message: '该航次未离港或已到港',
+      //     type: 'warning'
+      //   });
+      // }
     },
     // 导出清单
     shipInventoryExport() {