Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/components/warehouseLocation.vue

@@ -9,12 +9,12 @@
       v-bind="$attrs"
     >
       <el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}">
-        <el-tab-pane v-if="item.warehouseId === warehouseId"   :label="item.name" :name="'' + index" v-for="(item, index) in area"  :key="index">
+        <el-tab-pane v-if="item.warehouseId === warehouseId"   :label="item.name" :name="'' + index" v-for="(item, index) in area"  :key="item.id + index">
           <div>
             <div style="text-align: center">区域</div>
             <div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
               <el-row :gutter="20">
-                <el-col :span="12" v-for="(warehouse, i) in item.children" :key="i">
+                <el-col :span="12" v-for="(warehouse, i) in item.children" :key="warehouse.id + i">
                   <div
                     class="warehouse-block"
                     :class="{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}"
@@ -29,7 +29,7 @@
           <div>
             <div style="text-align: center">仓位</div>
             <div class="position-group">
-              <div class="position" v-for="position in activeWarehouse.positionList" :key="item.id">
+              <div class="position" v-for="(position ,index) in activeWarehouse.positionList" :key="item.id + index ">
                 <div
                   class="position-item"
                   v-for="item in position.children"