Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-invent...

huminmin

18 小时以前 7d1924d1924e2cafd77ca1ce3b7d5ca9336edb9c

 src/views/inventoryManagement/stockReport/index.vue

@@ -168,13 +168,27 @@
             show-overflow-tooltip
             v-if="searchForm.reportType !== 'inout'"
           />
           <el-table-column
             label="入库批次"
             prop="inboundBatches"
             width="240"
             show-overflow-tooltip
             v-if="searchForm.reportType !== 'inout'"
           />
          <el-table-column
            label="批号"
            width="240"
            show-overflow-tooltip
            v-if="searchForm.reportType !== 'inout'"
          >
            <template #default="scope">
              {{ scope.row.batchNo || scope.row.inboundBatches || "" }}
            </template>
          </el-table-column>
          <el-table-column
            label="供应商"
            prop="supplierName"
            min-width="200"
            show-overflow-tooltip
            v-if="searchForm.reportType !== 'inout'"
          >
            <template #default="scope">
              {{ scope.row.supplierName || scope.row.customer || "" }}
            </template>
          </el-table-column>
           <el-table-column
             label="产品大类"
             prop="productName"
@@ -184,6 +198,11 @@
             label="规格型号"
             prop="model"
             show-overflow-tooltip
           />
           <el-table-column
               label="UID码"
               prop="uidNo"
               show-overflow-tooltip
           />
           <el-table-column
             label="单位"
@@ -252,7 +271,7 @@
  getStockInventoryReportList
} from "@/api/inventoryManagement/stockInventory.js";
import {
  findAllQualifiedStockInRecordTypeOptions,
  findAllQualifiedStockInRecordTypeOptions,findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";


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