From 90a68941cad9dbd69d40c773c156110c5688a923 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 18:05:02 +0800
Subject: [PATCH] fix: s
---
packages/services/apiV2/dictionary.ts | 19 +
packages/services/apiV2/index.ts | 10
packages/hooks/dic.ts | 18
apps/bMiniApp/src/pages/home/HomeQueryPositionMenuView.vue | 4
packages/components/src/Form/ProRadio.vue | 2
packages/services/apiV2/task.ts | 45 +++
packages/services/apiV2/typings.d.ts | 486 ++++++++++++++++++++++++++++++----------
packages/services/apiV2/enterprise.ts | 51 ++++
packages/components/src/Input/ChooseInputWithPicker.vue | 4
packages/constants/apiEnum.ts | 60 ++++
types/api.d.ts | 4
11 files changed, 554 insertions(+), 149 deletions(-)
diff --git a/apps/bMiniApp/src/pages/home/HomeQueryPositionMenuView.vue b/apps/bMiniApp/src/pages/home/HomeQueryPositionMenuView.vue
index f7053e4..79c5d34 100644
--- a/apps/bMiniApp/src/pages/home/HomeQueryPositionMenuView.vue
+++ b/apps/bMiniApp/src/pages/home/HomeQueryPositionMenuView.vue
@@ -43,5 +43,9 @@
.home-query-position-menu-view {
max-height: 400px;
+
+ .position-select-view {
+ height: 400px;
+ }
}
</style>
diff --git a/packages/components/src/Form/ProRadio.vue b/packages/components/src/Form/ProRadio.vue
index 5ee6dc5..5bbb531 100644
--- a/packages/components/src/Form/ProRadio.vue
+++ b/packages/components/src/Form/ProRadio.vue
@@ -32,7 +32,7 @@
allBtnLabel: '涓嶉檺',
allBtnValue: '',
enumLabelKey: 'label',
- enumValueKey: 'value',
+ enumValueKey: 'code',
});
const model = defineModel<string | number>();
diff --git a/packages/components/src/Input/ChooseInputWithPicker.vue b/packages/components/src/Input/ChooseInputWithPicker.vue
index bd57273..e89cb4e 100644
--- a/packages/components/src/Input/ChooseInputWithPicker.vue
+++ b/packages/components/src/Input/ChooseInputWithPicker.vue
@@ -21,8 +21,8 @@
};
const props = withDefaults(defineProps<Props>(), {
- enumLabelKey: 'name',
- enumValueKey: 'id',
+ enumLabelKey: 'label',
+ enumValueKey: 'code',
});
const emit = defineEmits<{
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index f1a06ac..1e227fd 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -1,6 +1,18 @@
/* eslint-disable */
// @ts-ignore
+/** 璁¤垂鏂瑰紡 */
+export enum EnumBillingMethod {
+ /**鎸夋湀 */
+ Month = 10,
+ /**鎸夊ぉ */
+ Day = 20,
+ /**鎸夋椂 */
+ Hour = 30,
+ /**璁′欢 */
+ Piece = 40,
+}
+
/** 瀹㈡埛绔被鍨� */
export enum EnumClientType {
/**鐢佃剳缃戦〉 */
@@ -53,18 +65,20 @@
export enum EnumResourceController {
/**鏁版嵁瀛楀吀 */
Dictionary = 0,
+ /**浠诲姟 */
+ Task = 1,
/**鐢ㄦ埛璁よ瘉 */
- Auth = 1,
+ Auth = 2,
/**鐢ㄦ埛鑿滃崟 */
- Menu = 2,
+ Menu = 3,
/**鐢ㄦ埛璧勬簮 */
- Resource = 3,
+ Resource = 4,
/**鐢ㄦ埛瑙掕壊 */
- Role = 4,
+ Role = 5,
/**鐢ㄦ埛淇℃伅 */
- UserInfo = 5,
+ UserInfo = 6,
/**浼佷笟淇℃伅 */
- Enterprise = 6,
+ Enterprise = 7,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -95,12 +109,46 @@
All = 999,
}
+/** 缁撶畻鍛ㄦ湡 */
+export enum EnumSettlementCycle {
+ /**鏈堢粨 */
+ Month = 10,
+ /**鍛ㄧ粨 */
+ Week = 20,
+ /**鏃ョ粨 */
+ Day = 30,
+}
+
/** 鐭俊閫氶亾 */
export enum EnumSmsAccess {
/**闃块噷浜戠煭淇� */
AliyunSms = 10,
}
+/** 浠诲姟鍙戝竷鐘舵�� */
+export enum EnumTaskReleaseStatus {
+ /**鍙戝竷涓� */
+ InProcess = 20,
+ /**宸插仠姝� */
+ Stopped = 100,
+}
+
+/** 浠诲姟瀹夋帓鐘舵�� */
+export enum EnumTaskStatus {
+ /**寰呭畨鎺� */
+ Wait = 10,
+ /**宸插畨鎺� */
+ Complete = 20,
+}
+
+/** 鐢ㄦ埛鎬у埆 */
+export enum EnumUserGender {
+ /**鐢� */
+ Male = 10,
+ /**濂� */
+ Female = 20,
+}
+
/** 鐢ㄦ埛淇℃伅鐘舵�� */
export enum EnumUserInfoStatus {
/**姝ｅ父 */
diff --git a/packages/hooks/dic.ts b/packages/hooks/dic.ts
index f13b0da..acaf549 100644
--- a/packages/hooks/dic.ts
+++ b/packages/hooks/dic.ts
@@ -13,26 +13,25 @@
fieldNamesMap: x.data.fieldNames ? JSON.parse(x.data.fieldNames) : {},
}));
},
- placeholderData: () =>
- [] as API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[],
+ placeholderData: () => [] as API.SelectOptionGuidGetDictionaryCategorySelectQueryOption[],
});
const queryClient = useQueryClient();
function ensureQueryData() {
return queryClient.ensureQueryData<
- API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[]
+ API.SelectOptionGuidGetDictionaryCategorySelectQueryOption[]
>({
queryKey: ['dictionaryServices/getDictionaryCategorySelect'],
});
}
function getDictionaryCategoryById(id: string) {
- return dictionaryCategoryList.value.find((x) => x.value === id);
+ return dictionaryCategoryList.value.find((x) => x.data?.id === id);
}
function getDictionaryCategoryByCode(code: string) {
- return dictionaryCategoryList.value.find((x) => x.code === code);
+ return dictionaryCategoryList.value.find((x) => x.data?.code === code);
}
function getDictionaryCategoryNameByCode(code: string) {
@@ -72,16 +71,15 @@
code: x.data?.code ?? '',
}));
},
- placeholderData: () =>
- [] as API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[],
+ placeholderData: () => [] as API.SelectOptionStringGetDictionaryDataSelectQueryResultOption[],
});
function getDictionaryDataNameById(id: string) {
- return dictionaryDataList.value?.find((x) => x.value === id)?.label;
+ return dictionaryDataList.value?.find((x) => x.data?.id === id)?.label;
}
function getDictionaryDataByCode(code: string) {
- return dictionaryDataList.value?.find((x) => x.code === code);
+ return dictionaryDataList.value?.find((x) => x.data?.code === code);
}
function getDictionaryDataNameByCode(code: string) {
@@ -92,7 +90,7 @@
function ensureQueryData() {
return queryClient.ensureQueryData<
- API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[]
+ API.SelectOptionStringGetDictionaryDataSelectQueryResultOption[]
>({
queryKey: ['dictionaryServices/getDictionaryDataSelect'],
});
diff --git a/packages/services/apiV2/dictionary.ts b/packages/services/apiV2/dictionary.ts
index 22cee24..c48fb89 100644
--- a/packages/services/apiV2/dictionary.ts
+++ b/packages/services/apiV2/dictionary.ts
@@ -41,7 +41,7 @@
params: API.APIgetDictionaryCategorySelectParams,
options?: API.RequestConfig
) {
- return request<API.SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[]>(
+ return request<API.SelectOptionGuidGetDictionaryCategorySelectQueryOption[]>(
'/api/main/dictionary/getDictionaryCategorySelect',
{
method: 'GET',
@@ -79,7 +79,7 @@
params: API.APIgetDictionaryDataSelectParams,
options?: API.RequestConfig
) {
- return request<API.SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[]>(
+ return request<API.SelectOptionStringGetDictionaryDataSelectQueryResultOption[]>(
'/api/main/dictionary/getDictionaryDataSelect',
{
method: 'GET',
@@ -135,3 +135,18 @@
...(options || {}),
});
}
+
+/** 鍚屾浜哄姏璧勬簮鍦板尯瀛楀吀鏁版嵁 POST /api/main/dictionary/syncHumanResourcesAreaDictionaryData */
+export async function syncHumanResourcesAreaDictionaryData(
+ body: API.SyncHumanResourcesAreaDictionaryDataCommand,
+ options?: API.RequestConfig
+) {
+ return request<number>('/api/main/dictionary/syncHumanResourcesAreaDictionaryData', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/packages/services/apiV2/enterprise.ts b/packages/services/apiV2/enterprise.ts
index bfba64e..084e76e 100644
--- a/packages/services/apiV2/enterprise.ts
+++ b/packages/services/apiV2/enterprise.ts
@@ -2,6 +2,39 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鏌ヨ浼佷笟璇︽儏 GET /api/user/enterprise/getEnterprise */
+export async function getEnterprise(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseQueryResult>('/api/user/enterprise/getEnterprise', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ浼佷笟鐢靛瓙绛鹃厤缃� GET /api/user/enterprise/getEnterpriseElectronSignSetting */
+export async function getEnterpriseElectronSignSetting(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseElectronSignSettingParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseElectronSignSettingQueryResult>(
+ '/api/user/enterprise/getEnterpriseElectronSignSetting',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ浼佷笟淇℃伅鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterprise/getEnterprises */
export async function getEnterprises(body: API.GetEnterprisesQuery, options?: API.RequestConfig) {
return request<API.PagedListQueryResultGetEnterprisesQueryResultItem>(
@@ -17,6 +50,24 @@
);
}
+/** 鏌ヨ浼佷笟鐭俊閰嶇疆 GET /api/user/enterprise/getEnterpriseSmsSetting */
+export async function getEnterpriseSmsSetting(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseSmsSettingParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseSmsSettingQueryResult>(
+ '/api/user/enterprise/getEnterpriseSmsSetting',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 淇濆瓨浼佷笟 POST /api/user/enterprise/saveEnterprise */
export async function saveEnterprise(body: API.SaveEnterpriseCommand, options?: API.RequestConfig) {
return request<string>('/api/user/enterprise/saveEnterprise', {
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 1f801d3..de6fd71 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -2,19 +2,21 @@
/* eslint-disable */
// API 鏇存柊鏃堕棿锛�
// API 鍞竴鏍囪瘑锛�
+import * as userInfo from './userInfo';
import * as auth from './auth';
-import * as menu from './menu';
import * as dictionary from './dictionary';
+import * as menu from './menu';
import * as resource from './resource';
import * as role from './role';
-import * as userInfo from './userInfo';
import * as enterprise from './enterprise';
+import * as task from './task';
export default {
+ userInfo,
auth,
- menu,
dictionary,
+ menu,
resource,
role,
- userInfo,
enterprise,
+ task,
};
diff --git a/packages/services/apiV2/task.ts b/packages/services/apiV2/task.ts
new file mode 100644
index 0000000..264a625
--- /dev/null
+++ b/packages/services/apiV2/task.ts
@@ -0,0 +1,45 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 鏌ヨ浠诲姟璇︽儏 GET /api/main/task/getTaskInfo */
+export async function getTaskInfo(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetTaskInfoParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetTaskInfoQueryResult>('/api/main/task/getTaskInfo', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ浠诲姟鍒嗛〉鍒楄〃 POST /api/main/task/getTaskInfos */
+export async function getTaskInfos(body: API.GetTaskInfosQuery, options?: API.RequestConfig) {
+ return request<API.PagedListQueryResultGetTaskInfosQueryResultItem>(
+ '/api/main/task/getTaskInfos',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 淇濆瓨浠诲姟 POST /api/main/task/saveTaskInfo */
+export async function saveTaskInfo(body: API.SaveTaskInfoCommand, options?: API.RequestConfig) {
+ return request<string>('/api/main/task/saveTaskInfo', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 6dff9aa..f99c072 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -30,6 +30,27 @@
categoryCode?: string;
/** 涓婄骇Id */
parentId?: string;
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ /** 鏌ヨ鎵�鏈� */
+ all?: boolean;
+ /** 鏈�澶ф繁搴� */
+ maxDeep?: number;
+ }
+
+ interface APIgetEnterpriseElectronSignSettingParams {
+ /** Id */
+ id?: string;
+ }
+
+ interface APIgetEnterpriseParams {
+ /** Id */
+ id?: string;
+ }
+
+ interface APIgetEnterpriseSmsSettingParams {
+ /** Id */
+ id?: string;
}
interface APIgetMenuParams {
@@ -72,6 +93,11 @@
roleId?: string;
}
+ interface APIgetTaskInfoParams {
+ /** Id */
+ id?: string;
+ }
+
interface APIgetUserInfoRolesParams {
/** 鐢ㄦ埛Id */
userInfoId?: string;
@@ -91,75 +117,22 @@
ids: string[];
}
- interface DictionaryCategory {
- id?: string;
- createdTime?: string;
- updatedTime?: string;
- /** 鎺掑簭 */
- sort?: number;
- /** 璺熻釜Id */
- traceId?: string;
- /** 鍒涘缓鎿嶄綔浜� */
- createdUserInfoId?: string;
- /** 鏈�鍚庢洿鏂版搷浣滀汉 */
- updatedUserInfoId?: string;
- /** 鏄惁鍒犻櫎 */
- isDeleted?: boolean;
- /** 缂栧彿 */
- code: string;
- /** 鍚嶇О */
- name: string;
- /** 瀛楁鍚嶏紙閫楀彿闅斿紑锛� */
- fieldNames?: string;
- /** 澶囨敞 */
- remark?: string;
- }
-
- interface DictionaryData {
- id?: string;
- createdTime?: string;
- updatedTime?: string;
- /** 鎺掑簭 */
- sort?: number;
- /** 璺熻釜Id */
- traceId?: string;
- /** 鍒涘缓鎿嶄綔浜� */
- createdUserInfoId?: string;
- /** 鏈�鍚庢洿鏂版搷浣滀汉 */
- updatedUserInfoId?: string;
- /** 鏄惁鍒犻櫎 */
- isDeleted?: boolean;
- /** 绫诲埆Id */
- categoryId?: string;
- category?: DictionaryCategory;
- /** 涓婄骇Id */
- parentId?: string;
- parent?: DictionaryData;
- /** 涓嬬骇 */
- children?: DictionaryData[];
- /** 瀛楀吀璺緞 */
- path?: string;
+ interface DictionaryDataQueryModel {
/** 缂栧彿 */
code?: string;
- /** 鏄剧ず鍐呭 */
- content: string;
- /** 瀛楁1 */
- field1?: string;
- /** 瀛楁2 */
- field2?: string;
- /** 瀛楁3 */
- field3?: string;
- /** 瀛楁4 */
- field4?: string;
- /** 瀛楁5 */
- field5?: string;
- /** 鏄惁绂佺敤 */
- isDisabled?: boolean;
+ /** 鍚嶇О */
+ name?: string;
}
- interface DictionaryDataQueryResult {
- /** 鍐呭 */
- content?: string;
+ enum EnumBillingMethod {
+ /**鎸夋湀 */
+ Month = 10,
+ /**鎸夊ぉ */
+ Day = 20,
+ /**鎸夋椂 */
+ Hour = 30,
+ /**璁′欢 */
+ Piece = 40,
}
enum EnumClientType {
@@ -208,18 +181,20 @@
enum EnumResourceController {
/**鏁版嵁瀛楀吀 */
Dictionary = 0,
+ /**浠诲姟 */
+ Task = 1,
/**鐢ㄦ埛璁よ瘉 */
- Auth = 1,
+ Auth = 2,
/**鐢ㄦ埛鑿滃崟 */
- Menu = 2,
+ Menu = 3,
/**鐢ㄦ埛璧勬簮 */
- Resource = 3,
+ Resource = 4,
/**鐢ㄦ埛瑙掕壊 */
- Role = 4,
+ Role = 5,
/**鐢ㄦ埛淇℃伅 */
- UserInfo = 5,
+ UserInfo = 6,
/**浼佷笟淇℃伅 */
- Enterprise = 6,
+ Enterprise = 7,
}
enum EnumResourceMethod {
@@ -248,9 +223,39 @@
All = 999,
}
+ enum EnumSettlementCycle {
+ /**鏈堢粨 */
+ Month = 10,
+ /**鍛ㄧ粨 */
+ Week = 20,
+ /**鏃ョ粨 */
+ Day = 30,
+ }
+
enum EnumSmsAccess {
/**闃块噷浜戠煭淇� */
AliyunSms = 10,
+ }
+
+ enum EnumTaskReleaseStatus {
+ /**鍙戝竷涓� */
+ InProcess = 20,
+ /**宸插仠姝� */
+ Stopped = 100,
+ }
+
+ enum EnumTaskStatus {
+ /**寰呭畨鎺� */
+ Wait = 10,
+ /**宸插畨鎺� */
+ Complete = 20,
+ }
+
+ enum EnumUserGender {
+ /**鐢� */
+ Male = 10,
+ /**濂� */
+ Female = 20,
}
enum EnumUserInfoStatus {
@@ -287,6 +292,60 @@
timestamp?: number;
}
+ interface FriendlyResultGetEnterpriseElectronSignSettingQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseElectronSignSettingQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseSmsSettingQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseSmsSettingQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetMenuQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -313,6 +372,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetRoleQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetTaskInfoQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetTaskInfoQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -456,7 +533,7 @@
timestamp?: number;
}
- interface FriendlyResultListSelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption {
+ interface FriendlyResultListSelectOptionGuidGetDictionaryCategorySelectQueryOption {
/** 璺熻釜Id */
traceId?: string;
/** 鐘舵�佺爜 */
@@ -464,7 +541,7 @@
/** 閿欒鐮� */
errorCode?: string;
/** 鏁版嵁 */
- data?: SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption[];
+ data?: SelectOptionGuidGetDictionaryCategorySelectQueryOption[];
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -475,7 +552,7 @@
timestamp?: number;
}
- interface FriendlyResultListSelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption {
+ interface FriendlyResultListSelectOptionStringGetDictionaryDataSelectQueryResultOption {
/** 璺熻釜Id */
traceId?: string;
/** 鐘舵�佺爜 */
@@ -483,7 +560,7 @@
/** 閿欒鐮� */
errorCode?: string;
/** 鏁版嵁 */
- data?: SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption[];
+ data?: SelectOptionStringGetDictionaryDataSelectQueryResultOption[];
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -584,6 +661,24 @@
timestamp?: number;
}
+ interface FriendlyResultPagedListQueryResultGetTaskInfosQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PagedListQueryResultGetTaskInfosQueryResultItem;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultPasswordLoginCommandCallback {
/** 璺熻釜Id */
traceId?: string;
@@ -641,6 +736,8 @@
categoryId?: string;
/** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */
categoryCode?: string;
+ /** 涓婄骇Id */
+ parentId?: string;
/** 鍏抽敭瀛� */
keywords?: string;
}
@@ -654,7 +751,6 @@
categoryCode?: string;
/** 绫诲埆鍚嶇О */
categoryName?: string;
- category?: GetDictionaryDatasQueryResultItemCategory;
/** 涓婄骇Id */
parentId?: string;
/** 缂栧彿 */
@@ -677,11 +773,59 @@
isDisabled?: boolean;
}
- interface GetDictionaryDatasQueryResultItemCategory {
- /** 绫诲埆缂栧彿 */
- code?: string;
- /** 鍚嶇О */
- name?: string;
+ interface GetEnterpriseElectronSignSettingQueryResult {
+ /** Id */
+ id?: string;
+ realAccess?: EnumRealAccess;
+ /** 瀹炲悕璐圭敤 */
+ realVerifyCost?: number;
+ /** 绛剧害璐圭敤 */
+ signCost?: number;
+ /** 涓�鍙ｄ环 */
+ mergeSignCost?: number;
+ }
+
+ interface GetEnterpriseQueryResult {
+ /** Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓氱紪鍙� */
+ industryTypeCode?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
+ /** 涓昏惀涓氬姟 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ }
+
+ interface GetEnterpriseSmsSettingQueryResult {
+ /** Id */
+ id?: string;
+ smsAccess?: EnumSmsAccess;
+ /** 鐭俊璐圭敤 */
+ smsCost?: number;
}
interface GetEnterprisesQuery {
@@ -695,23 +839,24 @@
interface GetEnterprisesQueryResultItem {
/** Id */
id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
/** 鑱旂郴浜� */
contacts?: string;
/** 鑱旂郴鐢佃瘽 */
- contactNumber?: string;
- /** 鎵�鍦ㄧ渷浠絀d */
- provinceId?: string;
- province?: DictionaryDataQueryResult;
- /** 鎵�鍦ㄥ煄甯侷d */
- cityId?: string;
- city?: DictionaryDataQueryResult;
- /** 鎵�灞炶涓欼d */
- industryTypeId?: string;
- industryType?: DictionaryDataQueryResult;
- /** 鏄惁宸叉牎楠岄摱琛岃处鎴� */
- isCheckedBankCard?: boolean;
- realAccess?: EnumRealAccess;
- smsAccess?: EnumSmsAccess;
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
/** 鏄惁宸查厤缃� */
isConfigured?: boolean;
}
@@ -855,8 +1000,6 @@
}
interface GetOperationUserInfosQueryResultItemRole {
- /** 鐢ㄦ埛Id */
- userInfoId?: string;
/** 瑙掕壊Id */
id?: string;
/** 鍚嶇О */
@@ -956,6 +1099,72 @@
isChecked?: boolean;
}
+ interface GetTaskInfoQueryResult {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ billingMethod?: EnumBillingMethod;
+ /** 鏈嶅姟璐� */
+ serviceFee?: number;
+ settlementCycle?: EnumSettlementCycle;
+ /** 绂忓埄 */
+ benefits?: DictionaryDataQueryModel[];
+ /** 骞撮緞鑼冨洿鏈�灏� */
+ ageMinLimit?: number;
+ /** 骞撮緞鑼冨洿澶� */
+ ageMaxLimit?: number;
+ genderLimit?: EnumUserGender;
+ /** 璧勬牸璇佷功绫诲瀷 */
+ credentialLimits?: DictionaryDataQueryModel[];
+ /** 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 浠诲姟鍦扮偣鎵�灞炵渷浠� */
+ provinceName?: string;
+ /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 浠诲姟鍦扮偣鎵�灞炲煄甯� */
+ cityName?: string;
+ /** 浠诲姟鍦扮偣璇︾粏鍦板潃 */
+ address?: string;
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
+ }
+
+ interface GetTaskInfosQuery {
+ pageModel?: PagedListQueryPageModel;
+ /** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */
+ keywords?: string;
+ /** 鍙戝竷鏃堕棿 */
+ time?: string;
+ status?: EnumTaskStatus;
+ releaseStatus?: EnumTaskReleaseStatus;
+ }
+
+ interface GetTaskInfosQueryResultItem {
+ /** 浠诲姟鍚嶇О */
+ name: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ billingMethod?: EnumBillingMethod;
+ /** 鏈嶅姟璐� */
+ serviceFee?: number;
+ settlementCycle?: EnumSettlementCycle;
+ genderLimit?: EnumUserGender;
+ /** 鎶ュ悕浜烘暟 */
+ userCount?: number;
+ status?: EnumTaskStatus;
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ releaseStatus?: EnumTaskReleaseStatus;
+ }
+
interface GetUserInfoRolesQueryResultItem {
/** 瑙掕壊Id */
id?: string;
@@ -1012,6 +1221,12 @@
data?: GetRolesQueryResultItem[];
}
+ interface PagedListQueryResultGetTaskInfosQueryResultItem {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetTaskInfosQueryResultItem[];
+ }
+
interface PagedListQueryResultPageModel {
/** 琛屾暟 */
rows?: number;
@@ -1057,12 +1272,14 @@
interface SaveDictionaryDataCommand {
/** Id */
id?: string;
- /** 绫诲埆Id */
+ /** 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛� */
categoryId?: string;
+ /** 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛� */
+ categoryCode?: string;
/** 涓婄骇Id */
parentId?: string;
/** 缂栧彿 */
- code?: string;
+ code: string;
/** 鏄剧ず鍐呭 */
content: string;
/** 瀛楁1 */
@@ -1084,16 +1301,20 @@
interface SaveEnterpriseCommand {
/** Id */
id?: string;
- enterpriseAuth: SaveEnterpriseCommandAuth;
- /** 鎵�鍦ㄧ渷浠絀d */
- provinceId?: string;
- province?: DictionaryData;
- /** 鎵�鍦ㄥ煄甯侷d */
- cityId?: string;
- city?: DictionaryData;
- /** 鎵�灞炶涓欼d */
- industryTypeId?: string;
- industryType?: DictionaryData;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 鎵�灞炶涓氱紪鍙� */
+ industryTypeCode?: string;
/** 涓昏惀涓氬姟 */
mainBusiness?: string;
/** 鑱旂郴浜� */
@@ -1106,17 +1327,6 @@
userName?: string;
/** 瀵嗙爜 */
password?: string;
- }
-
- interface SaveEnterpriseCommandAuth {
- /** 浼佷笟鍏ㄧО */
- enterpriseName: string;
- /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
- societyCreditCode: string;
- /** 娉曚汉濮撳悕 */
- legalPerson?: string;
- /** 娉曚汉韬唤璇佸彿 */
- legalIdentity?: string;
}
interface SaveMenuButtonCommand {
@@ -1260,7 +1470,37 @@
resources?: GetRoleQueryResultResource[];
}
- interface SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption {
+ interface SaveTaskInfoCommand {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name: string;
+ billingMethod: EnumBillingMethod;
+ /** 鏈嶅姟璐� */
+ serviceFee: number;
+ settlementCycle: EnumSettlementCycle;
+ /** 绂忓埄缂栧彿 */
+ benefits?: string[];
+ /** 骞撮緞鑼冨洿鏈�灏� */
+ ageMinLimit: number;
+ /** 骞撮緞鑼冨洿澶� */
+ ageMaxLimit: number;
+ genderLimit: EnumUserGender;
+ /** 璧勬牸璇佷功绫诲瀷缂栧彿 */
+ credentialLimits?: string[];
+ /** 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙� */
+ provinceCode: string;
+ /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */
+ cityCode: string;
+ /** 浠诲姟鍦扮偣璇︾粏鍦板潃 */
+ address: string;
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime: string;
+ }
+
+ interface SelectOptionGuidGetDictionaryCategorySelectQueryOption {
/** 鍊� */
value?: string;
/** 鏍囩 */
@@ -1269,7 +1509,7 @@
data?: any;
}
- interface SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption {
+ interface SelectOptionStringGetDictionaryDataSelectQueryResultOption {
/** 鍊� */
value?: string;
/** 鏍囩 */
@@ -1339,4 +1579,6 @@
ids?: string[];
status?: EnumUserInfoStatus;
}
+
+ type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>;
}
diff --git a/types/api.d.ts b/types/api.d.ts
index e49049e..4b3ea80 100644
--- a/types/api.d.ts
+++ b/types/api.d.ts
@@ -25,12 +25,12 @@
field1?:string
}
- interface SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOption{
+ interface SelectOptionStringGetDictionaryDataSelectQueryResultOption{
fieldNamesMap?: SelectQueryResultOptionGuidGetDictionaryCategorySelectQueryOptionMap;
code?:string
}
- interface SelectQueryResultOptionGuidGetDictionaryDataSelectQueryResultOption{
+ interface SelectOptionGuidGetDictionaryCategorySelectQueryOption{
code?:string
}
}
--
Gitblit v1.9.1