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

云

4 天以前 41d4bedd762c6f8a8358baf33a065b052baab9cc

 src/views/inventoryManagement/stockReport/index.vue

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

  const { proxy } = getCurrentInstance();
@@ -265,12 +265,12 @@
  const fetchStockRecordTypeOptions = () => {
    findAllQualifiedStockInRecordTypeOptions().then(res => {
      stockRecordTypeOptions.value = res.data;
      findAllUnQualifiedStockInRecordTypeOptions().then(res => {
        stockRecordTypeOptions.value = [
          ...stockRecordTypeOptions.value,
          ...res.data,
        ];
      });
      // findAllUnQualifiedStockInRecordTypeOptions().then(res => {
      //   stockRecordTypeOptions.value = [
      //     ...stockRecordTypeOptions.value,
      //     ...res.data,
      //   ];
      // });
    });
  };