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

src/views/ecw/order/detail.vue

@@ -145,6 +145,34 @@
         </el-descriptions>
 
     </el-card>
+    <el-card class="card" v-if="[3].indexOf(+order.transportId) > -1">
+      <el-descriptions class="mr-10" border :title="$t('空运专线')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+        <el-descriptions-item :label="$t('是否双清')">
+          <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('航空公司')">
+          {{ order.airlineCompany }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书')">
+            {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书备注')">
+            {{ order.clearCertRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('是否拆包')">
+            {{order.isUnpack? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('单票立刻转运')">
+          {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求')">
+          <dict-tag :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="order.packageTypeArr" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求备注')">
+            {{order.packageRemarks}}
+          </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">