完善订单详情外部仓信息

src/views/ecw/order/detail.vue

@@ -42,58 +42,61 @@
       </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-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>
-            <el-descriptions-item :label="$t('运输方式')" :span="2">
-              <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
-            </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-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
-            <el-descriptions-item :label="$t('送货时间')">{{order.deliveryDate}}</el-descriptions-item>
-            <el-descriptions-item :label="$t('是否控货')">
-              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('填单信息')">
-              {{order.costVO.totalNum}}{{$t('箱')}}
-              {{order.costVO.totalWeight}}Kg
-              {{order.costVO.totalVolume}}m³
-              {{order.costVO.totalQuantity}}{{$t('个')}}
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('仓库实测')">
-              {{order.sumNum}}{{$t('箱')}}
-              {{order.sumWeight}}Kg
-              {{order.sumVolume}}m³
-              {{order.sumQuantity}}{{$t('个')}}
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('收款数据')">
-              {{order.sumNum}}{{$t('箱')}}
-              {{order.vweight}}Kg
-              {{order.wvolume}}m³
-              {{order.sumQuantity}}{{$t('个')}}
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('入仓类型')">
-              <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('单证报关')">
-              <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('出单方式')">
-              <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('代收货款')">
-              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-col>
-      </el-row>
+      <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>
+        <el-descriptions-item :label="$t('运输方式')" :span="2">
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('出货渠道')" :span="2">{{channelName}}</el-descriptions-item>
+      </el-descriptions>
+    </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('是否控货')">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('填单信息')">
+          {{order.costVO.totalNum}}{{$t('箱')}}
+          {{order.costVO.totalWeight}}Kg
+          {{order.costVO.totalVolume}}m³
+          {{order.costVO.totalQuantity}}{{$t('个')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('仓库实测')">
+          {{order.sumNum}}{{$t('箱')}}
+          {{order.sumWeight}}Kg
+          {{order.sumVolume}}m³
+          {{order.sumQuantity}}{{$t('个')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('收款数据')">
+          {{order.sumNum}}{{$t('箱')}}
+          {{order.vweight}}Kg
+          {{order.wvolume}}m³
+          {{order.sumQuantity}}{{$t('个')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('入仓类型')">
+          <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('单证报关')">
+          <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('出单方式')">
+          <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
+        </el-descriptions-item>
+        <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-card>
     <el-card class="card">
       <el-tabs v-model="activeName">