Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

zhangwencui

2 天以前 e3f7ae14a6b98e4fbfba04a0c1bbe26802dfc1c5

 src/views/inventoryManagement/stockReport/index.vue

@@ -53,7 +53,7 @@
        </el-button>
        <el-button @click="handleReset">重置</el-button>
      </div>
      

      <div class="search_right">
<!--        <el-button type="success" @click="handleExport" icon="Download">-->
<!--          导出报表-->
@@ -166,14 +166,14 @@
             prop="createTime"
             width="200"
             show-overflow-tooltip
             v-if="!searchForm.reportType === 'inout'"
             v-if="searchForm.reportType !== 'inout'"
           />
           <el-table-column
             label="入库批次"
             prop="inboundBatches"
             width="240"
             show-overflow-tooltip
             v-if="!searchForm.reportType === 'inout'"
             v-if="searchForm.reportType !== 'inout'"
           />
           <el-table-column
             label="产品大类"
@@ -207,15 +207,21 @@
             prop="totalStockOut"
             width="100"
             align="center"
             v-if="searchForm.reportType === 'inout'"
           />
           <el-table-column
             label="现在库存"
             prop="currentStock"
             align="center"
           />
            <el-table-column
             label="现净重(吨)"
             prop="currentWeight"
             align="center"
           />
           <el-table-column label="来源"
                            prop="recordType"
                            v-if="!searchForm.reportType === 'inout'"
                            v-if="searchForm.reportType !== 'inout'"
                            show-overflow-tooltip>
             <template #default="scope">
               {{ getRecordType(scope.row.recordType) }}
@@ -225,7 +231,7 @@
             label="入库人"
             prop="createBy"
             width="80"
             v-if="!searchForm.reportType === 'inout'"
             v-if="searchForm.reportType !== 'inout'"
             show-overflow-tooltip
           />
        </el-table>
@@ -239,14 +245,12 @@
import { ElMessage } from 'element-plus'
import * as echarts from 'echarts'
import {
  getStockMonthlyReport,
  getStockInOutReport,
} from '@/api/inventoryManagement/stockReport'
import {
  getStockInventoryInAndOutReportList,
  getStockInventoryReportList
} from "@/api/inventoryManagement/stockInventory.js";
import {findAllQualifiedStockRecordTypeOptions} from "@/api/basicData/enum.js";
import {
  findAllQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";


const { proxy } = getCurrentInstance()
@@ -276,7 +280,7 @@

// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  findAllQualifiedStockRecordTypeOptions()
  findAllQualifiedStockInRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })