入仓储位只显示当前城市的仓库

src/components/WarehouseAreaDialog/index.vue

@@ -86,6 +86,25 @@ export default {
     visible(val) {
       if (val) {
         this.opened = true
+
+        getByWarehouseId({cityId: this.cityId}).then(r => {
+          const area = r.data
+          area.forEach(e => {
+            // 仓库
+            e.children.forEach(f => {
+              // 区域
+              f.selected = false
+              if(f.positionList) f.positionList.forEach(g => {
+                // 位置
+                g.children.forEach(k => {
+                  // 子位置
+                  k.selected = false
+                })
+              })
+            })
+          })
+          this.area = area
+        })
       } else {
       }
     },
@@ -148,28 +167,7 @@ export default {
   },
 
   mounted() {
-    if (this.visible) {
-      this.opened = true
-    }
-
-    getByWarehouseId({cityId: this.cityId}).then(r => {
-      const area = r.data
-      area.forEach(e => {
-        // 仓库
-        e.children.forEach(f => {
-          // 区域
-          f.selected = false
-          if(f.positionList) f.positionList.forEach(g => {
-            // 位置
-            g.children.forEach(k => {
-              // 子位置
-              k.selected = false
-            })
-          })
-        })
-      })
-      this.area = area
-    })
+    console.log('area dialog mounted')
   },
 
   computed: {

src/views/ecw/order/warehousing/index.vue

@@ -58,7 +58,7 @@
         v-slot="{row}"
         label="状态">
         <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
-        <span class="red" v-show="row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}箱</span>
+        <span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}箱</span>
       </el-table-column>
       <el-table-column
         prop="address"
@@ -105,7 +105,8 @@
       </div>
     </el-form>
 
-    <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" :order-id="orderId" :city-id="order.departureVO.departureId"></warehouse-area-dialog>
+    <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
+                           :order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
 
     <edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
 
@@ -318,6 +319,9 @@ export default {
         }
       })
       return result
+    },
+    cityId(){
+      return  this.order?.departureVO?.departureId
     }
   }
 }