From 1e7b702373512f4f43168ded10d2aa889bf4209f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 15 八月 2025 14:23:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/services/api/index.ts | 3 ++-
src/views/CPersonManage/CPersonManageList.vue | 6 ------
src/views/TaskManage/components/SignDetailView.vue | 15 +++++++++------
src/views/Login/Login.vue | 8 ++++----
src/store/modules/user.ts | 1 -
auto-imports.d.ts | 2 +-
6 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 0bc8cee..01350e2 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -514,4 +514,4 @@
readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
}
-}
\ No newline at end of file
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 38f65d3..65aec52 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -10,12 +10,12 @@
import * as ocrUtils from './ocrUtils';
import * as dictionary from './dictionary';
import * as userResume from './userResume';
+import * as fileUtils from './fileUtils';
import * as auth from './auth';
import * as taskCheckReceive from './taskCheckReceive';
import * as resource from './resource';
import * as taskUser from './taskUser';
import * as menu from './menu';
-import * as fileUtils from './fileUtils';
export default {
enterpriseEmployee,
user,
@@ -25,6 +25,7 @@
ocrUtils,
dictionary,
userResume,
+ fileUtils,
auth,
taskCheckReceive,
resource,
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c9364bf..02bc2ca 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -68,7 +68,6 @@
},
{
showLoading: false,
- skipErrorHandler: true,
}
);
if (res) {
diff --git a/src/views/CPersonManage/CPersonManageList.vue b/src/views/CPersonManage/CPersonManageList.vue
index 0386ff9..c3a5dc6 100644
--- a/src/views/CPersonManage/CPersonManageList.vue
+++ b/src/views/CPersonManage/CPersonManageList.vue
@@ -204,10 +204,4 @@
tabType: '',
},
});
-
-async function getPersonalUserInfoSignContracts(id: string) {
- try {
- return await userServices.getPersonalUserInfoSignContracts({ id: id });
- } catch (error) {}
-}
</script>
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 4486379..9f4d292 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -188,10 +188,10 @@
});
} catch (error) {
console.log(error);
- ElMessage({
- message: '鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛�',
- type: 'error',
- });
+ // ElMessage({
+ // message: '鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒锛�',
+ // type: 'error',
+ // });
}
};
const beforeLog = useDebounceFn(onLogin, 1000);
diff --git a/src/views/TaskManage/components/SignDetailView.vue b/src/views/TaskManage/components/SignDetailView.vue
index fefa445..02b5ea1 100644
--- a/src/views/TaskManage/components/SignDetailView.vue
+++ b/src/views/TaskManage/components/SignDetailView.vue
@@ -1,7 +1,7 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <ProTableV2 v-bind="proTableProps" :columns="signColumns" :operationBtns="signOperationBtns">
+ <ProTableV2 v-bind="proTableProps" :columns="signColumns" :showOperationColumn="false">
</ProTableV2>
</AppContainer>
</LoadingLayout>
@@ -9,7 +9,7 @@
<script setup lang="ts">
import { ProTableV2, LoadingLayout, AppContainer, useTable } from '@bole-core/components';
-import * as taskServices from '@/services/api/task';
+import * as userResumeServices from '@/services/api/userResume';
defineOptions({
name: 'SignDetailView',
@@ -48,15 +48,15 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetTaskInfosQuery = {
+ let params: API.GetUserResumesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- enterpriseId: id,
+ taskInfoId: id,
};
- let res = await taskServices.getTaskInfos(params, {
+ let res = await userResumeServices.getUserResumes(params, {
showLoading: !state.loading,
});
return res;
@@ -66,7 +66,10 @@
defaultExtraParams: {
orderInput: [{ property: 'id', order: EnumPagedListOrder.Asc }],
},
- columnsRenderProps: {},
+ columnsRenderProps: {
+ hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
+ gender: { type: 'enum', valueEnum: EnumUserGenderText },
+ },
}
);
</script>
--
Gitblit v1.9.1