Merge remote-tracking branch 'origin/master'

ruoyi-admin-vue/src/views/inventory/inbound_items/index.vue

@@ -717,9 +717,9 @@ export default {
     clearWarehouse(row) {
       this.$set(row, 'warehouseId', null);
       this.$set(row, 'warehousesName', null);
-      // 同时清除库位选择
-      this.clearLocation(row);
-      this.$emit('cell-change', { row, prop: 'warehouseId', value: null });
+      // // 同时清除库位选择
+      // this.clearLocation(row);
+      // this.$emit('cell-change', { row, prop: 'warehouseId', value: null });
     },
 
     // 清除库位选择