diff --git a/src/apis/system/user.ts b/src/apis/system/user.ts index 59257e1..479f7f4 100644 --- a/src/apis/system/user.ts +++ b/src/apis/system/user.ts @@ -63,3 +63,8 @@ export function resetUserPwd(data: any, id: string) { export function updateUserRole(data: { roleIds: string[] }, id: string) { return http.patch(`${BASE_URL}/${id}/role`, data) } + +/** @desc 按姓名模糊搜索用户 */ +export function searchUserByName(name: string) { + return http.get(`${BASE_URL}/searchByName`, { name }) +} diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index 369aad4..eab6be6 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -70,6 +70,6 @@ declare global { // for type re-export declare global { // @ts-ignore - export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' + export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue' import('vue') } diff --git a/src/views/project-management/personnel-dispatch/construction-personnel.vue b/src/views/project-management/personnel-dispatch/construction-personnel.vue index c25741e..ef46a07 100644 --- a/src/views/project-management/personnel-dispatch/construction-personnel.vue +++ b/src/views/project-management/personnel-dispatch/construction-personnel.vue @@ -180,7 +180,17 @@
- +
@@ -304,7 +314,7 @@ \ No newline at end of file diff --git a/src/views/project-management/personnel-dispatch/index.vue b/src/views/project-management/personnel-dispatch/index.vue index 2451c01..a0bcbd8 100644 --- a/src/views/project-management/personnel-dispatch/index.vue +++ b/src/views/project-management/personnel-dispatch/index.vue @@ -79,7 +79,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -215,7 +215,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -351,7 +351,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -487,7 +487,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -623,7 +623,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -759,7 +759,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -895,7 +895,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -1031,7 +1031,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -1180,10 +1180,10 @@ 负责人: {{ project.manager || '未指定' }}
-
- - 团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }} -
+
+ + 团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }} +
项目进度 @@ -1327,7 +1327,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -1474,7 +1474,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -1621,7 +1621,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -1915,7 +1915,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -2062,7 +2062,7 @@ 负责人: {{ project.manager || '未指定' }}
-
+
团队: {{ project.teamSize > 0 ? project.teamSize + '人' : '未设置' }}
@@ -3041,11 +3041,11 @@ const openSiteManagement = (project: any) => { } // 人员管理 -const openPersonnelManagement = () => { - if (currentProject.value && currentProject.value.id) { +const openPersonnelManagement = (project: any) => { + if (project && project.id) { router.push({ path: '/project-management/personnel-dispatch/construction-personnel', - query: { projectId: currentProject.value.id } + query: { projectId: project.id } }) } else { Message.error('项目信息不完整,无法进入团队成员管理') diff --git a/src/views/project-management/projects/progress/index.vue b/src/views/project-management/projects/progress/index.vue index 812e92c..ae5a12d 100644 --- a/src/views/project-management/projects/progress/index.vue +++ b/src/views/project-management/projects/progress/index.vue @@ -1,476 +1,1448 @@ - - \ No newline at end of file +