From b65d117cd956c2a60d531f36160ad044584e0bf4 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 13:22:05 +0800 Subject: [PATCH] fix: 灵工管理 --- apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 26 +++--- packages/services/apiV2/index.ts | 6 + packages/services/apiV2/taskCheckReceive.ts | 57 ++++++++++++++ packages/services/apiV2/typings.d.ts | 110 ++++++++++++++++++++++++--- packages/services/apiV2/taskUser.ts | 18 ---- packages/constants/apiEnum.ts | 18 ++-- apps/cMiniApp/src/pages/mine/index.vue | 4 + 7 files changed, 183 insertions(+), 56 deletions(-) diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue index d27651b..0122195 100644 --- a/apps/cMiniApp/src/pages/mine/index.vue +++ b/apps/cMiniApp/src/pages/mine/index.vue @@ -150,6 +150,10 @@ enabled: isLogin, }); +Taro.useDidShow(() => { + refetch(); +}); + function goLogin() { if (!isLogin.value) { goLoginFn(); diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue index 0efdd59..bc00fd5 100644 --- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue @@ -185,7 +185,7 @@ }); /** - * TODO 缂哄皯 鎵嬫満 鎶曡瘔涓炬姤鎺ュ彛 鎶ュ悕鎺ュ彛 + * TODO 缂哄皯 鎶曡瘔涓炬姤鎺ュ彛 */ const router = Taro.useRouter(); @@ -236,31 +236,29 @@ }; let res = await taskUserServices.applyTask(params); if (res) { - Message.success('鎶ュ悕鎴愬姛', { - onClosed() { - refetch({ type: 'inactive' }); - }, - }); + Message.success('鎶ュ悕鎴愬姛'); + refetch({ type: 'inactive' }); } } catch (error) {} }); const handleAttention = useAccessLogin(async () => { try { - await Message.confirm({ - message: `纭畾${detail.value?.isCollected ? '鍙栨秷鏀惰棌' : '鏀惰棌'}鍚楋紵`, - }); + // await Message.confirm({ + // message: `纭畾${detail.value?.isCollected ? '鍙栨秷鏀惰棌' : '鏀惰棌'}鍚楋紵`, + // }); let params: API.CollectTaskCommand = { ids: [id], isCollect: !detail.value?.isCollected, }; let res = await taskUserServices.collectTask(params); if (res) { - Message.success('鎿嶄綔鎴愬姛', { - onClosed() { - refetch({ type: 'inactive' }); - }, - }); + refetch({ type: 'inactive' }); + // Message.success('鎿嶄綔鎴愬姛', { + // onClosed() { + // refetch({ type: 'inactive' }); + // }, + // }); } } catch (error) {} }); diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index 9bd5d57..8d03ef1 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -93,22 +93,24 @@ Task = 1, /**浠诲姟浜哄憳 */ TaskUser = 2, + /**浠诲姟楠屾敹 */ + TaskCheckReceive = 3, /**鐢ㄦ埛璁よ瘉 */ - Auth = 3, + Auth = 4, /**鐢ㄦ埛鑿滃崟 */ - Menu = 4, + Menu = 5, /**鐢ㄦ埛璧勬簮 */ - Resource = 5, + Resource = 6, /**鐢ㄦ埛瑙掕壊 */ - Role = 6, + Role = 7, /**鐢ㄦ埛淇℃伅 */ - User = 7, + User = 8, /**鐢ㄦ埛绠�鍘� */ - UserResume = 8, + UserResume = 9, /**浼佷笟淇℃伅 */ - Enterprise = 9, + Enterprise = 10, /**鐏靛伐淇℃伅 */ - EnterpriseEmployee = 10, + EnterpriseEmployee = 11, } /** 璧勬簮璇锋眰鏂瑰紡 */ diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts index d5c3133..e5221f9 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/index.ts @@ -2,7 +2,9 @@ /* eslint-disable */ // API 鏇存柊鏃堕棿锛� // API 鍞竴鏍囪瘑锛� +import * as enterpriseEmployee from './enterpriseEmployee'; import * as role from './role'; +import * as taskCheckReceive from './taskCheckReceive'; import * as enterprise from './enterprise'; import * as task from './task'; import * as dictionary from './dictionary'; @@ -11,10 +13,11 @@ import * as auth from './auth'; import * as resource from './resource'; import * as taskUser from './taskUser'; -import * as enterpriseEmployee from './enterpriseEmployee'; import * as menu from './menu'; export default { + enterpriseEmployee, role, + taskCheckReceive, enterprise, task, dictionary, @@ -23,6 +26,5 @@ auth, resource, taskUser, - enterpriseEmployee, menu, }; diff --git a/packages/services/apiV2/taskCheckReceive.ts b/packages/services/apiV2/taskCheckReceive.ts new file mode 100644 index 0000000..f290dbd --- /dev/null +++ b/packages/services/apiV2/taskCheckReceive.ts @@ -0,0 +1,57 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTask */ +export async function getCheckReceiveTask( + body: API.GetCheckReceiveTaskQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTask', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUser */ +export async function getCheckReceiveTaskUser( + body: API.GetCheckReceiveTaskUserQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskUserQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUser', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ楠屾敹璇︽儏 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits */ +export async function getCheckReceiveTaskUserSubmits( + body: API.GetCheckReceiveTaskUserSubmitsQuery, + options?: API.RequestConfig +) { + return request<API.GetCheckReceiveTaskUserSubmitsQueryResult>( + '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} diff --git a/packages/services/apiV2/taskUser.ts b/packages/services/apiV2/taskUser.ts index 2b056fb..af03cc7 100644 --- a/packages/services/apiV2/taskUser.ts +++ b/packages/services/apiV2/taskUser.ts @@ -41,24 +41,6 @@ }); } -/** 鏌ヨ楠屾敹鍒嗛〉鍒楄〃 POST /api/flexjob/taskUser/getCheckReceiveTaskUserInfos */ -export async function getCheckReceiveTaskUserInfos( - body: API.GetCheckReceiveTaskUserInfosQuery, - options?: API.RequestConfig -) { - return request<API.GetCheckReceiveTaskUserInfosQueryResult>( - '/api/flexjob/taskUser/getCheckReceiveTaskUserInfos', - { - method: 'POST', - headers: { - 'Content-Type': 'application/json-patch+json', - }, - data: body, - ...(options || {}), - } - ); -} - /** B绔煡璇㈠簲鑱樻姤鍚嶅垎椤靛垪琛ㄤ俊鎭� POST /api/flexjob/taskUser/getTaskUsers */ export async function getTaskUsers(body: API.GetTaskUsersQuery, options?: API.RequestConfig) { return request<API.GetTaskUsersQueryResult>('/api/flexjob/taskUser/getTaskUsers', { diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index 860e74f..801d496 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -292,22 +292,24 @@ Task = 1, /**浠诲姟浜哄憳 */ TaskUser = 2, + /**浠诲姟楠屾敹 */ + TaskCheckReceive = 3, /**鐢ㄦ埛璁よ瘉 */ - Auth = 3, + Auth = 4, /**鐢ㄦ埛鑿滃崟 */ - Menu = 4, + Menu = 5, /**鐢ㄦ埛璧勬簮 */ - Resource = 5, + Resource = 6, /**鐢ㄦ埛瑙掕壊 */ - Role = 6, + Role = 7, /**鐢ㄦ埛淇℃伅 */ - User = 7, + User = 8, /**鐢ㄦ埛绠�鍘� */ - UserResume = 8, + UserResume = 9, /**浼佷笟淇℃伅 */ - Enterprise = 9, + Enterprise = 10, /**鐏靛伐淇℃伅 */ - EnterpriseEmployee = 10, + EnterpriseEmployee = 11, } enum EnumResourceMethod { @@ -497,14 +499,50 @@ timestamp?: number; } - interface FriendlyResultGetCheckReceiveTaskUserInfosQueryResult { + interface FriendlyResultGetCheckReceiveTaskQueryResult { /** 璺熻釜Id */ traceId?: string; /** 鐘舵�佺爜 */ code?: number; /** 閿欒鐮� */ errorCode?: string; - data?: GetCheckReceiveTaskUserInfosQueryResult; + data?: GetCheckReceiveTaskQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCheckReceiveTaskUserQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCheckReceiveTaskUserQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetCheckReceiveTaskUserSubmitsQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetCheckReceiveTaskUserSubmitsQueryResult; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -1288,7 +1326,35 @@ arrangeStatus?: EnumTaskUserArrangeStatus; } - interface GetCheckReceiveTaskUserInfosQuery { + interface GetCheckReceiveTaskQuery { + /** 楠屾敹鏃ユ湡-鏈�鏃╂椂闂� */ + dateBegin?: string; + /** 楠屾敹鏃ユ湡-鏈�鏅氭椂闂� */ + dateEnd?: string; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + pageModel?: PagedListQueryPageModel; + } + + interface GetCheckReceiveTaskQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetCheckReceiveTaskQueryResultItem[]; + } + + interface GetCheckReceiveTaskQueryResultItem { + /** 浠诲姟Id */ + id?: string; + /** 浠诲姟鍚嶇О */ + name?: string; + /** 浠诲姟寮�濮嬫椂闂� */ + beginTime?: string; + /** 浠诲姟缁撴潫鏃堕棿 */ + endTime?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + } + + interface GetCheckReceiveTaskUserQuery { /** 浠诲姟Id */ taskInfoId?: string; /** 鍏抽敭瀛� */ @@ -1301,13 +1367,13 @@ pageModel?: PagedListQueryPageModel; } - interface GetCheckReceiveTaskUserInfosQueryResult { + interface GetCheckReceiveTaskUserQueryResult { pageModel?: PagedListQueryResultPageModel; /** 鏁版嵁 */ - data?: GetCheckReceiveTaskUserInfosQueryResultItem[]; + data?: GetCheckReceiveTaskUserQueryResultItem[]; } - interface GetCheckReceiveTaskUserInfosQueryResultItem { + interface GetCheckReceiveTaskUserQueryResultItem { /** 浠诲姟Id */ id?: string; /** 浠诲姟鍚嶇О */ @@ -1331,6 +1397,20 @@ lastSubmitTime?: string; checkReceiveStatus?: EnumTaskCheckReceiveStatus; } + + interface GetCheckReceiveTaskUserSubmitsQuery { + /** 浠诲姟Id */ + id?: string; + pageModel?: PagedListQueryPageModel; + } + + interface GetCheckReceiveTaskUserSubmitsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetCheckReceiveTaskUserSubmitsQueryResultItem[]; + } + + type GetCheckReceiveTaskUserSubmitsQueryResultItem = Record<string, any>; type GetCurrentLogierMenusQuery = Record<string, any>; @@ -1508,6 +1588,8 @@ interface GetEnterpriseEmployeesQueryResultItem { /** 鐏靛伐Id */ id?: string; + /** 澶村儚 */ + avatar?: string; /** 濮撳悕 */ name?: string; /** 韬唤璇佸彿 */ -- Gitblit v1.9.1