From 7dfae8e6376ab235c0d560dc998acda39a7c28b9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 七月 2025 13:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/system/user.js | 8 ++++++++
src/views/inventoryManagement/issueManagement/index.vue | 4 ++--
src/views/inventoryManagement/stockManagement/index.vue | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 7192d9b..431f6b0 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -135,6 +135,14 @@
})
}
// 鏌ヨ鐢ㄦ埛鍒楄〃
+export function userListNoPageByTenantId() {
+ return request({
+ url: '/system/user/userListNoPageByTenantId',
+ method: 'get'
+ })
+}
+
+// 鏌ヨ鐢ㄦ埛鍒楄〃
export function userListNoPage() {
return request({
url: '/system/user/userListNoPage',
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 2c28e35..859dc94 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";
@@ -185,7 +185,7 @@
console.log('form',form.value)
// 鍔犺浇鐢ㄦ埛鍒楄〃
try {
- const userLists = await userListNoPage()
+ const userLists = await userListNoPageByTenantId()
userList.value = userLists.data
} catch (error) {
console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 6356d7a..86f1a76 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -140,7 +140,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 { productTreeList,modelList } from "@/api/basicData/product.js"
import {
getStockManagePage ,
@@ -257,7 +257,7 @@
operationType.value = type
form.value = {}
productData.value = []
- let userLists = await userListNoPage()
+ let userLists = await userListNoPageByTenantId()
userList.value = userLists.data
// customerList().then(res => {
// customerOption.value = res
--
Gitblit v1.9.3