修复一些出货bug

src/views/ecw/box/cancelClear.vue

+<template>
+  <div class="shipping-update-error">
+    <div class="message-title">{{$t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`)}}</div>
+    <el-form ref="arrivalForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
+      <el-form-item :label="$t('撤销理由')" prop="clEstTime">
+        <el-input v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
+      </el-form-item>
+    </el-form>
+
+    <el-row class="operate-button">
+      <el-button type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
+      <el-button @click="cancel">{{$t('取消')}}</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { approvalCreate } from "@/api/ecw/boxSea";
+
+export default {
+  name: "updateError",
+  inheritAttrs: false,
+  components: {},
+  props: {
+    shipmentObj: Object,
+    cancelClearInfo: Object,
+  },
+  data() {
+    return {
+      // 到港对象
+      cusClearanceObj: {},
+      // 校验
+      rules: {
+        applyReason: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ]
+      }
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs["arrivalForm"].validate((valid) => {
+        if (valid) {
+          approvalCreate({
+            shipmentId: this.shipmentObj.id,
+            approvalStatus: 0,
+            approvalType: 21,
+            orderId: this.cancelClearInfo.orderId,
+            applyReason: this.cusClearanceObj.applyReason
+          }).then(()=>{
+              this.$message.success("成功");
+              this.cancel()
+            })
+        }
+      });
+    },
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.shipping-update-error {
+  .message-title {
+    text-align: center;
+    font-size: 20px;
+    margin: 0 20px 10px;
+  }
+}
+</style>

src/views/ecw/box/queryAir.vue

@@ -108,6 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus!=132&&shipmentObj.clearanceInfo&&(shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) !== -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -213,6 +214,9 @@
       <template v-if="dialogConfig.type === 'updateClear'">
         <updateClear v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :clearInfo="clearInfo" />
       </template>
+      <template v-if="dialogConfig.type === 'cancelClear'">
+        <cancelClear v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :cancelClearInfo="cancelClearInfo" />
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -244,6 +248,7 @@ import editForm from "./editForm.vue";
 import updateError from "./updateError.vue";
 import updateArrival from "./updateArrival.vue";
 import updateClear from "./updateClear.vue";
+import cancelClear from "./cancelClear.vue";
 import { listUser } from "@/api/system/user";
 
 export default {
@@ -257,7 +262,8 @@ export default {
     editForm,
     updateError,
     updateArrival,
-    updateClear
+    updateClear,
+    cancelClear
   },
   created() {
     this.transportTypes = this.getDictDatas(
@@ -352,6 +358,7 @@ export default {
       clearInfo: {
         orderList: []
       },
+      cancelClearInfo: {}
     };
   },
   methods: {
@@ -419,6 +426,11 @@ export default {
       this.$set(this.clearInfo, "type", type);
       this.handleCommand("updateClear");
     },
+    /* 更新清关状态 */
+    cancleClear(val) {
+      this.cancelClearInfo = val
+      this.handleCommand("cancelClear");
+    },
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
         // 报关异常 customsHasAbnormal
@@ -603,6 +615,10 @@ export default {
           this.$set(this.dialogConfig, "visible", true);
           this.$set(this.dialogConfig, "type", "updateClear");
           break;
+        case "cancelClear":
+          this.$set(this.dialogConfig, "visible", true);
+          this.$set(this.dialogConfig, "type", "cancelClear");
+          break;
       }
     },
     // 关闭弹框

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

@@ -124,7 +124,7 @@ export default {
     }
     if(!this.airArrivalInfo.arriveType) this.$set(this.airArrivalInfo,'arriveType',0)
     if(this.airArrivalInfo.arrivalOrderList) this.$set(this.airArrivalInfo,'arriveOrderIdList',[])
-    if(this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList) this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList
+    this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo?this.$attrs.shipmentObj.airArrivalInfo?.arrivalOrderList.arrivalOrderList:[]
     shipmentOrderList(this.$attrs.shipmentObj.id).then(r=>{
       this.orderList = r.data
       this.orderListFilter = r.data