Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/box/shippingSea/nodePage/tally/warehouseDetail.vue

@@ -33,6 +33,7 @@
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
       <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
       <el-table-column :label="$t('快递单号')" prop="expressNo" />
+      <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
       <el-table-column :label="$t('入仓时间')" prop="inTime">
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
       </el-table-column>
@@ -77,7 +78,7 @@ export default {
     title() {
       if (!this.orderItem) return "-";
       return this.$l(this.orderItem, "prodTitle") + " - " + this.$t("入仓记录");
-    },
+    }
   },
 
   created() {

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -162,6 +162,7 @@
                 <el-table-column :label="$t('储位')" prop="orderLocationBackVOList"  width="150px">
                   <template v-slot="{ row, column, $index }">
                     <warehouse-area-select
+                      v-if="visible"
                       v-model="tableData[$index].orderLocationBackVOList"
                       :order-id="orderId"
                       :order-item-id="warehousing.orderItemId"