Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/queryAir.vue

@@ -166,7 +166,7 @@
               </el-table-column>
               <el-table-column prop="billAbnId" :label="$t('异常')" align="center">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.BOX_AIR_SHIPMENT_PROCESS" :value="scope.row.billAbnId" />
+                  <dict-tag :type="DICT_TYPE[getregprocess(scope.row.opStep)]" :value="scope.row.billAbnId" />
                 </template>
               </el-table-column>
               <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="300"></el-table-column>
@@ -368,6 +368,24 @@ export default {
     };
   },
   methods: {
+    getregprocess(val) {
+      var data = ''
+      switch(val){
+        case 10:
+          data = 'FLYING_TICKET_EXCEPTION'
+          break;
+        case 12:
+          data = 'ARRIVAL_TICKET_EXCEPTION'
+          break
+        case 13:
+          data = 'CLEARANCE_TICKET_EXCEPTION'
+          break
+        default:
+          data = 'BOX_SHIPPING_TICKET_EXCEPTION'
+          break
+      }
+      return data
+    },
     selectable(row, index) {
       if (row.abnormalDealStatus === 1) return false;
       return true;