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

gaoluyang

昨天 eb6f3d149c6279877cf806575901bb482d7f2b64

 src/views/inventoryManagement/stockReport/index.vue

@@ -252,7 +252,7 @@
  getStockInventoryReportList
} from "@/api/inventoryManagement/stockInventory.js";
import {
  findAllQualifiedStockInRecordTypeOptions,
  findAllQualifiedStockInRecordTypeOptions,findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";


@@ -293,6 +293,10 @@
  findAllQualifiedStockInRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
        findAllUnQualifiedStockInRecordTypeOptions()
          .then(res => {
          stockRecordTypeOptions.value = [...stockRecordTypeOptions.value,...res.data];
      })
      })
}