修复空运出货的bug

src/utils/dict.js

@@ -220,6 +220,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
   BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型
   BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state',
+  BOX_AIR_SHIPMENT_STATE: 'air_shipment_status',
   BOX_INSPECTION_TIME_CUSTOMS: 'inspection_time_customs', // 校验时间-报关
   BOX_INSPECTION_TIME_SHIPPING: 'inspection_time_shipping', // 校验时间-起运
   BOX_INSPECTION_TIME_ARRIVAL: 'inspection_time_arrival', // 校验时间-到港

src/views/ecw/box/indexAir.vue

@@ -21,9 +21,9 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('状态')" prop="boxStatus">
-        <el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
+      <el-form-item :label="$t('状态')" prop="shipmentStatusAir">
+        <el-select v-model="queryParams.shipmentStatusAir" :placeholder="$t('请选择状态')" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-row>
@@ -268,7 +268,7 @@ export default {
         selfNo: null,
         cubNo: null,
         cabinetId: null,
-        boxStatus: null,
+        shipmentStatusAir: null,
         startWarehouseId: null,
         destWarehouseId: null,
         transportType: null

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

@@ -386,8 +386,12 @@ export default {
     },
     //提交删单退场审核
     approvalCreate(){
-      if(!this.cusDeclarationObj.deleteExitType || !this.cusDeclarationObj.deleteExitTime){
-        this.$message.error(this.$t("请选择类型或者时间"));
+      if(!this.cusDeclarationObj.deleteExitType){
+        this.$message.error(this.$t("请选择删单退场类型或者时间"));
+        return;
+      }
+      if(this.cusDeclarationObj.deleteExitType == 1 && !this.cusDeclarationObj.deleteExitTime){
+        this.$message.error(this.$t("请选择退场时间"));
         return;
       }
       let details = {

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

@@ -174,7 +174,7 @@
                     </el-table-column>
                     <el-table-column :label="$t('特性')" align="center" prop="attrNameList" width="120">
                       <template slot-scope="scope">
-                        {{scope.row.attrNameList?scope.row.attrNameList.toString():''}}
+                        {{scope.row.warehouseInAttrNameList?scope.row.warehouseInAttrNameList.toString():""}}
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('备案')" align="center" prop="productRecord" width="100">

src/views/ecw/box/shippingAir/utils.js

@@ -293,7 +293,7 @@ function airBaseData() {
          * 卸柜状态：181、未卸柜；182、卸柜中；183、卸柜审核中；184、卸柜审核失败；185、卸柜审核成功；186、已卸柜
          */
         voName: "cabinetUnloadInfo",
-        keyName: "ulStatus",
+        keyName: "toWarehouseStatus",
         status: {
           start: [181],
           wait: [182, 183, 184, 185],