Merge remote-tracking branch 'origin/dev' into dev

11121b6f · 邓春圆 · 0ec609ff · 7cd7f07c · 11121b6f
Commit 11121b6f authored Oct 10, 2023 by 邓春圆
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Warehouse.vue src/views/ecw/order/warehousing/components/Warehouse.vue +1 -1

No files found.
--- a/src/views/ecw/order/warehousing/components/Warehouse.vue
+++ b/src/views/ecw/order/warehousing/components/Warehouse.vue
@@ -743,7 +743,7 @@ export default {
      this.form.orderId = this.warehousing.orderId
      this.form.orderItemId = this.warehousing.orderItemId
      this.form.orderNo = this.warehousing.orderNo
-      if (this.edit || this.isAdd) {
+      if ((this.edit || this.isAdd) && this.warehousing.warehouseInProdAttrIds !== null ) {
        this.form.warehouseInProdAttrIds = this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e) || []
      } else {
        this.form.warehouseInProdAttrIds =