From 35e8bd80ff9d33a7ab01777f863a41ce97a2051a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 14 八月 2025 14:54:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/views/inventoryManagement/issueManagement/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index f2c73cb..4240bef 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -71,7 +71,7 @@
import { ref } from 'vue'
import { ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
+import { userListNoPageByTenantId } from "@/api/system/user.js";
import {
getStockInPage
} from "@/api/inventoryManagement/stockIn.js";
@@ -131,6 +131,7 @@
getStockInPage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
+ total.value = res.data.total
console.log('res', res.data.records)
}).catch(() => {
tableLoading.value = false
@@ -185,7 +186,7 @@
console.log('form',form.value)
// 鍔犺浇鐢ㄦ埛鍒楄〃
try {
- const userLists = await userListNoPage()
+ const userLists = await userListNoPageByTenantId()
userList.value = userLists.data
} catch (error) {
console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
--
Gitblit v1.9.3