Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/shippingAir/shippingAir.vue

@@ -61,6 +61,7 @@ export default {
   },
   data() {
     return {
+      airBaseData,
       shipmentObj: {},
       warehouseList: [],
       // 供应商
@@ -72,7 +73,7 @@ export default {
       // 用户
       allUsers: [],
       // 流程图节点
-      seaBaseData: airBaseData(),
+      seaBaseData: [],
       // 状态
       statusLabel: "",
     };
@@ -119,6 +120,24 @@ export default {
       getbox(this.shipmentId).then((res) => {
         const { data } = res;
         this.shipmentObj = data ?? {};
+        this.seaBaseData  = this.airBaseData()
+        if(this.shipmentObj.destinationClearance==3&&this.shipmentObj.deliveryType==2){
+          this.seaBaseData = this.seaBaseData.filter(item=>{
+            var flag = true
+            item.forEach(element => {
+              if(element.type == 'agent'){
+                flag = false
+              }
+              if(element.type == 'unloading'){
+                flag = false
+              }
+              if(element.type == 'clrDocument'){
+                flag = false
+              }
+            });
+            return flag
+          })
+        }
       });
     },
   },