From 5b9b534b7e4d39483dfa740c415b5b1777b064ed Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 14:34:02 +0800
Subject: [PATCH] Merge branch 'dev-v1.1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1.1
---
/dev/null | 173 -------------------------------------------
src/constants/module.ts | 6 +
src/store/modules/user.ts | 2
src/utils/common/index.ts | 1
types/api.d.ts | 2
5 files changed, 6 insertions(+), 178 deletions(-)
diff --git a/src/constants/module.ts b/src/constants/module.ts
index 798ceca..74739c0 100644
--- a/src/constants/module.ts
+++ b/src/constants/module.ts
@@ -1,3 +1,5 @@
+import { defineColumns } from '@bole-core/components';
+
export enum SubModuleType {
MenuButton = 1,
/**
@@ -90,7 +92,7 @@
[SubModuleType.Column]: FastColumnList,
};
-export const ModuleColumns: API.CustomModuleColumnDto[] = [
+export const ModuleColumns = defineColumns([
{
id: '1',
enCode: 'name',
@@ -131,4 +133,4 @@
name: '鏈夋晥',
width: 80,
},
-];
+]);
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 271d314..91a830c 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -50,7 +50,7 @@
},
userId(state) {
- return '';
+ return state.userDetail?.id;
},
},
actions: {
diff --git a/src/utils/common/categoryUtils.ts b/src/utils/common/categoryUtils.ts
deleted file mode 100644
index aec4b0c..0000000
--- a/src/utils/common/categoryUtils.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-// import { IndustryCategoryType } from '@/constants';
-export class BaseCategoryRoute implements API.CategoryDto {
- name: string;
- id: string;
- routeName: string;
- isDependencing = false;
-
- constructor(category: API.CategoryDto) {
- this.id = category.id;
- this.name = category.name;
- }
-
- getRouteName() {
- return this.routeName;
- }
-
- getQuery() {
- return {};
- }
-}
-
-export class FrontNeedSomeoneCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontNeedSomeone';
-}
-
-export class FrontNeedHeadHunterCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontNeedHeadHunter';
-}
-
-export class FrontNeedTrainCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontNeedTrain';
-}
-
-export class FrontOrderCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontOrder';
-}
-
-export class FrontResourceCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontResource';
-}
-
-export class FrontHRCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontHR';
-}
-
-export class FrontHumanResourceCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontHumanResource';
-}
-
-export class FrontParkCategoryRoute extends BaseCategoryRoute {
- routeName = 'FrontPark';
- isDependencing = true;
-}
-
-export class IndustryMatchingCategoryRoute extends BaseCategoryRoute {
- routeName = 'IndustryComplement';
-
- getQuery() {
- return {
- categoryId: this.id ?? '',
- };
- }
-}
-
-export class IndustryInformationCategoryRoute extends BaseCategoryRoute {
- routeName = 'IndustryInformation';
-
- getQuery() {
- return {
- categoryId: this.id ?? '',
- };
- }
-}
-
-export class CategoryUtils {
- static isHumanResource(categoryName: string) {
- return categoryName === '浜鸿祫鍏徃';
- }
- static isSocialSecurityAgency(categoryName: string) {
- return categoryName === '绀句繚浠ｇ悊';
- }
- static isIHasResource(categoryName: string) {
- return categoryName === '鎴戞湁浜�';
- }
- static isIHasOrder(categoryName: string) {
- return categoryName === '鎴戞湁璁㈠崟';
- }
- static isHumanResourceByName(categoryName: string) {
- return categoryName === '浜哄姏璧勬簮鍗忎細';
- }
-
- static isIHasPark(categoryName: string) {
- return categoryName === '鎴戞湁鍥尯';
- }
- static isCampusRecruitment(categoryName: string) {
- return categoryName === '鏍″洯鎷涜仒';
- }
-
- static isPayrollElectronicTag(categoryName: string) {
- return categoryName === '鍙戣柂鐢电';
- }
- static isInsurance(categoryName: string) {
- return categoryName === '淇濋櫓';
- }
- static isBackgroundCheck(categoryName: string) {
- return categoryName === '鑳岃皟';
- }
-
- static isINeedPerson(categoryName: string) {
- return categoryName === '鎴戣浜�';
- }
- static isINeedHeadHunter(categoryName: string) {
- return categoryName === '鎴戣鐚庡ご';
- }
- static isINeedTrain(categoryName: string) {
- return categoryName === '鎴戣鍩硅';
- }
-
- static isINeedConsult(categoryName: string) {
- return categoryName === '鎴戣鍜ㄨ';
- }
- static isRLZYJJRXH(categoryName: string) {
- return categoryName === '浜哄姏璧勬簮缁忕悊浜哄崗浼�';
- }
-
- static RenboExhibition(categoryName: string) {
- return categoryName === '浜哄崥灞曚細';
- }
- static IndustryForums(categoryName: string) {
- return categoryName === '琛屼笟璁哄潧';
- }
-
- static InformationGathering(categoryName: string) {
- return categoryName === '琛屼笟璧勮';
- }
- static IndustryPolicy(categoryName: string) {
- return categoryName === '琛屼笟鏀跨瓥';
- }
-
- static isZYXS(categoryName: string) {
- return categoryName === '鍗撶帴瀛︾ぞ';
- }
-
- static CategoryRouteMap = new Map<string, typeof BaseCategoryRoute>([
- //------------鐢叉柟闇�姹�------------
- ['鎴戣浜�', FrontNeedSomeoneCategoryRoute],
- ['鎴戣鐚庡ご', FrontNeedHeadHunterCategoryRoute],
- ['鎴戣鍩硅', FrontNeedTrainCategoryRoute],
- //------------琛屼笟鏈嶅姟------------
- ['鎴戞湁璁㈠崟', FrontOrderCategoryRoute],
- ['鎴戞湁浜�', FrontResourceCategoryRoute],
- ['浜鸿祫鍏徃', FrontHRCategoryRoute],
- ['浜哄姏璧勬簮鍗忎細', FrontHumanResourceCategoryRoute],
- //------------琛屼笟閰嶅------------
- ['鎴戞湁鍥尯', FrontParkCategoryRoute],
- ['鍙戣柂鐢电', IndustryMatchingCategoryRoute],
- ['淇濋櫓', IndustryMatchingCategoryRoute],
- ['鑳岃皟', IndustryMatchingCategoryRoute],
- //------------琛屼笟鍜ㄨ------------
- ['浜哄崥灞曚細', IndustryInformationCategoryRoute],
- ['琛屼笟璁哄潧', IndustryInformationCategoryRoute],
- ['琛屼笟璧勮', IndustryInformationCategoryRoute],
- ['琛屼笟鍔ㄦ��', IndustryInformationCategoryRoute],
- ['琛屼笟鏀跨瓥', IndustryInformationCategoryRoute],
- ]);
-
- static createCategoryRoute(category: API.CategoryDto): BaseCategoryRoute {
- const CategoryRoute = this.CategoryRouteMap.get(category.name);
- if (CategoryRoute) {
- return new CategoryRoute(category);
- }
- }
-}
diff --git a/src/utils/common/index.ts b/src/utils/common/index.ts
index 481d8d9..2892294 100644
--- a/src/utils/common/index.ts
+++ b/src/utils/common/index.ts
@@ -12,7 +12,6 @@
export * from './tree';
export * from './file';
export * from './vueHelper';
-export * from './categoryUtils';
export * from './encrypt';
export * from './deepClone';
export * from './pdf';
diff --git a/types/api.d.ts b/types/api.d.ts
index 5771ec0..0ccff64 100644
--- a/types/api.d.ts
+++ b/types/api.d.ts
@@ -14,7 +14,7 @@
customErrorHandler?: (error: any) => boolean;
}
- interface AreaTreeNode {
+ interface AreaTreeNode {
children?: AreaTreeNode[];
/** 缂栫爜 */
areaCode?: string;
--
Gitblit v1.9.1