From e3f7ae14a6b98e4fbfba04a0c1bbe26802dfc1c5 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 06 三月 2026 17:39:15 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/inventoryManagement/stockReport/index.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 0bbfac6..5e9dfb5 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/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;
})
--
Gitblit v1.9.3