diff --git a/src/api/system/user.ts b/src/api/system/user.ts index f1fe650..fecb88a 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -20,10 +20,19 @@ export function queryPostByUserIdApi(userid : string) { * @param config 用户信息 * @returns */ -export function editUserApi(config) { +export function editUserApi(config : object) { return http({ url: '/sys/user/appEdit', method: 'PUT', data: config }); +} + +/*根据部门Cod和角色Id查询用户信息*/ +export function queryUserByOrgRoleApi(config : object) { + return http({ + url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId', + method: 'GET', + data: config + }) } \ No newline at end of file diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue index 9135ec2..69388f6 100644 --- a/src/pages-humanResource/absence/add.vue +++ b/src/pages-humanResource/absence/add.vue @@ -27,6 +27,8 @@ :rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" /> + + { if (valid) { + console.log('----',model) const submitData = { ...model, type: model.type[model.type.length - 1], // 取最后一级 @@ -196,7 +203,7 @@ const startMutilProcess = (id) => { startMutilProcessApi({ - flowCode: "dev_cxc_qxj", + flowCode: "dev_cxc_qxj_new", id, formUrl: "modules/qxj/modules/CxcQxjBpmModel", formUrlMobile: "leaveApplication" @@ -245,7 +252,7 @@ } }) zwmc.value = res.result.zwmc - if (zwmc.value == '单位专家' || zwmc.value == '基层正职' || zwmc.value == '高级主管') { + if (zwmc.value == '2') { examineleader.value = '分管领导'; } else { examineleader.value = '审批领导'; @@ -330,11 +337,28 @@ minEndtime.value = model.begintime } + const getHrList = () => { + queryUserByOrgRoleApi({ + roleId: '1554379432313397250', + orgCode: userStore.userInfo.orgCode + }).then(res => { + model.hr = res.result[0].username + hrData.value = res.result.map(item => { + return { + label: item.realname, + value: item.username + } + }) + }) + } + onLoad(() => { /*获取请假类别*/ getTypeList() /*获取审批领导*/ getZwmcAndExa() + /*获取劳资员*/ + getHrList() /*获取*/ queryHisDate() }); diff --git a/src/utils/index.ts b/src/utils/index.ts index e79d1b3..164de76 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -391,7 +391,7 @@ function handleDefaultLocation() { function weatherRequest(params : { lat ?: number; lon ?: number; q ?: string }) { const store = useAppStore() uni.request({ - url: 'https://api.openweathermap.org/data/2.5/weather', + url: 'http://api.openweathermap.org/data/2.5/weather', method: 'GET', data: { ...params,