diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java index f1dc6a5a..e6c7e5d9 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusConstructionUserVo.java @@ -50,6 +50,12 @@ public class BusConstructionUserVo implements Serializable { @ExcelProperty(value = "人脸照") private String facePic; + /** + * 人脸照 url + */ + @ExcelProperty(value = "人脸照 url") + private String facePicUrl; + /** * 人员姓名 */ @@ -80,6 +86,12 @@ public class BusConstructionUserVo implements Serializable { @ExcelProperty(value = "班组id") private Long teamId; + /** + * 班组 + */ + @ExcelProperty(value = "班组") + private BusProjectTeamVo teamVo; + /** * 状态(0在职 1离职) */ diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java index f7748f12..f8be7660 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java @@ -22,10 +22,8 @@ import org.dromara.project.domain.req.constructionuser.ConstructionUserUpdateReq import org.dromara.project.domain.vo.BusConstructionUserVo; import org.dromara.project.domain.vo.BusContractorVo; import org.dromara.project.mapper.BusConstructionUserMapper; -import org.dromara.project.service.IBusConstructionUserService; -import org.dromara.project.service.IBusContractorService; -import org.dromara.project.service.IBusProjectService; -import org.dromara.project.service.IBusProjectTeamMemberService; +import org.dromara.project.service.*; +import org.dromara.system.service.ISysOssService; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -58,6 +56,12 @@ public class BusConstructionUserServiceImpl extends ServiceImpl - + - - + - @@ -207,6 +213,7 @@ import { listContractor } from '@/api/project/contractor'; import { listProjectTeam } from '@/api/project/projectTeam'; import { ContractorVO } from '@/api/project/contractor/types'; import { ProjectTeamVO } from '@/api/project/projectTeam/types'; +import ConstructionUserDetail from '@/views/project/constructionUser/component/ConstructionUserDetail.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { type_of_work, user_sex_type, user_clock_type } = toRefs(proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type')); @@ -407,6 +414,14 @@ const handleUpdate = async (row?: ConstructionUserVO) => { dialog.title = '修改施工人员'; }; +/** 展开用户详情抽屉操作 */ +const currentUserId = ref(); +const showDetailDrawer = ref(false); +const handleShowDrawer = (row?: ConstructionUserVO) => { + currentUserId.value = row.id; + showDetailDrawer.value = true; +}; + /** 提交按钮 */ const submitForm = () => { constructionUserFormRef.value?.validate(async (valid: boolean) => { diff --git a/plus-ui/src/views/project/contractor/index.vue b/plus-ui/src/views/project/contractor/index.vue index c64e2f99..d872c2f0 100644 --- a/plus-ui/src/views/project/contractor/index.vue +++ b/plus-ui/src/views/project/contractor/index.vue @@ -51,7 +51,7 @@