diff --git a/env/.env.development b/env/.env.development index f2e675f..7414cee 100644 --- a/env/.env.development +++ b/env/.env.development @@ -7,9 +7,7 @@ VITE_SHOW_SOURCEMAP = true # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' -VITE_SERVER_BASEURL = 'http://10.75.166.170:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.166.174:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://10.75.166.6/test' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 7bbc605..71d830e 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -29,7 +29,7 @@ export function editUserApi(config : object) { /*根据部门Cod和角色Id查询用户信息*/ export function queryUserByOrgRoleApi(config : object) { return http({ - url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId', + url: '/sys/user/queryByDepCodRoleId', method: 'GET', data: config }) diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 5753e67..0dcbbda 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -335,17 +335,13 @@ roleId: '1554379432313397250', orgCode: code }).then(res => { - if (res.result.length > 0) { - model.hr = res.result[0].username - } - if (!code) { - hrData.value = res.result.map(item => { - return { - label: item.realname, - value: item.username - } - }) - } + model.hr = res.result.user.username + hrData.value = res.result.list.map(item => { + return { + label: item.realname, + value: item.username + } + }) }) } @@ -364,8 +360,6 @@ getZwmcAndExa() /*获取工作单位*/ queryDepName() - /*获取劳资员*/ - getHrList() /*获取*/ queryHisDate() });