完善订单详情外部仓信息

src/views/ecw/order/detail.vue

@@ -42,9 +42,7 @@
       </el-row>
     </el-card>
     <el-card class="card">
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-descriptions class="margin-top" border :title="$t('物流信息')" :column="2">
+      <el-descriptions border :title="$t('物流信息')" :column="2">
         <el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
         <el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
         <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item>
@@ -53,9 +51,10 @@
         </el-descriptions-item>
         <el-descriptions-item :label="$t('出货渠道')" :span="2">{{channelName}}</el-descriptions-item>
       </el-descriptions>
-        </el-col>
-        <el-col :span="12">
-          <el-descriptions class="margin-top" border :title="$t('基础信息')" :column="2">
+    </el-card>
+    
+    <el-card class="card">
+      <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2">
         <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
         <el-descriptions-item :label="$t('送货时间')">{{order.deliveryDate}}</el-descriptions-item>
         <el-descriptions-item :label="$t('是否控货')">
@@ -91,9 +90,13 @@
         <el-descriptions-item :label="$t('代收货款')">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('集运仓库')">
+          {{isExternalWarehouse ? '自有仓' : '外部仓'}}
+          <div v-for="(item, index) in order.externalWarehouseDtoList" :key="index">
+            装柜时间： {{item.estLoadingTime}} 装柜地址：{{item.loadingAddress}}
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
-        </el-col>
-      </el-row>
     </el-card>
     <el-card class="card">
       <el-tabs v-model="activeName">