From 5709db9dc8d689cdbb7a17842998de185b4a6b91 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 13:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index a71d689..e4aac00 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -53,7 +53,11 @@
:key="node.id"
style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
>
- <div>鑺傜偣{{ index + 1 }} 鈫�</div>
+ <div>
+ <span v-if="index === 0">鍙戣捣</span>
+ <span v-else>瀹℃壒</span>
+ 鈫�
+ </div>
<el-select
v-model="node.userId"
placeholder="閫夋嫨浜哄憳"
@@ -126,8 +130,8 @@
approveProcessAdd, approveProcessGetInfo,
approveProcessUpdate,
getDept
-} from "../../../../api/collaborativeApproval/approvalProcess.js";
-import {userListNoPage, getUserProfile} from "../../../../api/system/user.js";
+} from "@/api/collaborativeApproval/approvalProcess.js";
+import {userListNoPageByTenantId} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
@@ -174,7 +178,7 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- userListNoPage().then((res) => {
+ userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
getProductOptions();
--
Gitblit v1.9.3