From cb50bebb9d25a904dae32190a0507c53a7a865f2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 19 一月 2026 13:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/views/inventoryManagement/receiptManagement/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 577e0f3..9aebae4 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -285,7 +285,7 @@
layout="total, sizes, prev, pager, next, jumper"
:page="page.current"
:limit="page.size"
- @pagination="paginationChange"/>
+ @pagination="pageProductChange"/>
</div>
</el-tab-pane>
</el-tabs>
@@ -378,7 +378,7 @@
params.timeStr = searchForm.value.timeStr;
}
params.productCategory = searchForm.value.productCategory;
- if (activeTab.value === "production") {
+ if (activeTab.value === "product") {
getStockInPageByProductProduction(params)
.then(res => {
tableLoading.value = false;
--
Gitblit v1.9.3