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

spring

2026-03-19 ccb00a17b9119200b8c8d29a177bcc129dd4c982

 src/views/inventoryManagement/stockReport/index.vue

@@ -214,6 +214,11 @@
             prop="currentStock"
             align="center"
           />
            <el-table-column
             label="现净重(吨)"
             prop="currentWeight"
             align="center"
           />
           <el-table-column label="来源"
                            prop="recordType"
                            v-if="searchForm.reportType !== 'inout'"
@@ -230,24 +235,35 @@
             show-overflow-tooltip
           />
        </el-table>

        <div style="margin-top: 12px; display: flex; justify-content: flex-end;">
          <el-pagination
            background
            layout="total, sizes, prev, pager, next, jumper"
            :total="page.total"
            v-model:page-size="page.size"
            v-model:current-page="page.current"
            :page-sizes="[10, 20, 50, 100]"
            @size-change="handlePageChange"
            @current-change="handlePageChange"
          />
        </div>
      </el-card>
    </div>
  </div>
</template>

<script setup>
import { ref, reactive, onMounted, nextTick } from 'vue'
import { ref, reactive, onMounted, nextTick, getCurrentInstance } from 'vue'
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()
@@ -269,6 +285,16 @@
  tableData: []
})

const page = reactive({
  current: 1,
  size: 10,
  total: 0,
})

const handlePageChange = () => {
  fetchList()
}

const stockRecordTypeOptions = ref([])

const getRecordType = (recordType) => {
@@ -277,7 +303,7 @@

// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  findAllQualifiedStockRecordTypeOptions()
  findAllQualifiedStockInRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
@@ -302,8 +328,7 @@
  }
}

// 查询数据
const handleQuery = async () => {
const fetchList = async () => {
  if (!validateSearchForm()) {
    return
  }
@@ -320,6 +345,7 @@
    }
    if (response.code === 200) {
      reportData.value.tableData = response.data.records
      page.total = Number(response.data.total ?? 0) || 0
      // reportData.value.summary = response.data.summary
      // reportData.value.chartData = response.data.chartData
      // nextTick(() => {
@@ -332,6 +358,12 @@
  } finally {
    tableLoading.value = false
  }
}

// 查询数据（按钮触发：回到第一页）
const handleQuery = () => {
  page.current = 1
  fetchList()
}
// // 生成假数据
// const generateMockData = () => {
@@ -393,7 +425,9 @@
    startMonth: "",
    endMonth: "",
    startDate: "",
    endDate: ""
    endDate: "",
    current: page.current,
    size: page.size,
  }
  
  if (searchForm.reportType === 'daily') {
@@ -415,6 +449,9 @@
  searchForm.singleDate = ''
  searchForm.dateRange = []
  searchForm.monthRange = []
  page.current = 1
  page.size = 10
  page.total = 0
  reportData.value = {
    summary: null,
    chartData: null,