未入仓时取填单数据；已入仓时取入仓数据

src/views/ecw/order/addAssociatedOrder.vue

@@ -26,10 +26,14 @@
       <el-table-column :label="$t('唛头')" prop="marks"></el-table-column>
       <el-table-column :label="$t('货物数据')">
         <template v-slot="{row}">
-          <div v-if="row.costVO">
+          <div v-if="row.costVO && row.status !== 5">
             箱数：{{row.costVO.totalNum}}
             {{row.costVO.totalVolume}}m³
             {{row.costVO.totalWeight}}kg
+          </div> <div  v-else>
+            箱数：{{row.sumQuantity}}
+            {{row.sumVolume}}m³
+            {{row.sumWeight}}kg
           </div>
         </template>
       </el-table-column>
@@ -41,6 +45,7 @@
       <el-table-column :label="$t('状态')">
         <template v-slot:default="scope">
           <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
+          {{scope.row.status}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')">