From 7343ef57056cbd1197240a58fabb785c84b39691 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 18 八月 2025 16:51:52 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 10 +++
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue | 15 ++--
packages/services/apiV2/index.ts | 4
packages/services/apiV2/resource.ts | 17 +++++
packages/services/apiV2/task.ts | 15 +++++
packages/services/apiV2/typings.d.ts | 74 ++++++++++++++++++++++++
apps/cMiniApp/src/pages/task/InnerPage.vue | 1
packages/components/src/Calendar/Calendar.vue | 8 --
packages/constants/apiEnum.ts | 2
packages/hooks/enterprise.ts | 8 +-
packages/services/apiV2/user.ts | 15 +++++
11 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/apps/cMiniApp/src/pages/task/InnerPage.vue b/apps/cMiniApp/src/pages/task/InnerPage.vue
index 3f5639d..d5cbd2e 100644
--- a/apps/cMiniApp/src/pages/task/InnerPage.vue
+++ b/apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -46,6 +46,7 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+ console.log('queryState.date: ', queryState.date);
if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
Taro.navigateTo({
url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
index 39fc6a2..dfbebb2 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
+++ b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
@@ -3,33 +3,32 @@
<div v-if="isCertified" class="companyInfo-info-wrapper">
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟鍚嶇О</div>
- <div class="companyInfo-info-item-content">{{ enterpriseDetail.enterpriseName }}</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">缁熶竴绀句細淇＄敤浠ｇ爜</div>
- <div class="companyInfo-info-item-content">{{ enterpriseDetail.societyCreditCode }}</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.societyCreditCode }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">娉ㄥ唽璧勬湰</div>
- <div class="companyInfo-info-item-content">鎹屼桨涓囧厓鏁�</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.registeredCapital }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟绫诲瀷</div>
- <div class="companyInfo-info-item-content">鏈夐檺璐ｄ换鍏徃锛堣嚜鐒朵汉鎶曡祫鎴栨帶鑲� 鐨勬硶浜虹嫭璧勶級</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseType }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">鎴愮珛鏃ユ湡</div>
- <div class="companyInfo-info-item-content">2024骞�11鏈�11鏃�</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.establishmentDate }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟鍦板潃</div>
- <div class="companyInfo-info-item-content">姹熻タ鐪佷節姹熷競鍏遍潚鍩庡競xx璺痻x鍙穢x xxxx</div>
+ <div class="companyInfo-info-item-content">{{ enterpriseDetail?.address }}</div>
</div>
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">缁忚惀鑼冨洿</div>
<div class="companyInfo-info-item-content">
- 鎴戞槸钀ヤ笟鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅鎴� 鏄惀涓氭墽鐓т笂鐨勭粡钀ヨ寖鍥翠俊鎭垜鏄�
- 钀ヤ笟鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅鎴戞槸钀� 涓氭墽鐓т笂鐨勭粡钀ヨ寖鍥翠俊鎭垜鏄惀涓� 鎵х収涓婄殑缁忚惀鑼冨洿淇℃伅
+ {{ enterpriseDetail?.mainBusiness }}
</div>
</div>
</div>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index fc871cd..a10ccc6 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -41,7 +41,7 @@
:unit="BillingMethodEnumUnit[detail.billingMethod]"
/>
</div>
- <div class="taskDetail-address-wrapper">
+ <div class="taskDetail-address-wrapper" @click="goMap">
<div class="taskDetail-address-title-wrapper">
<img :src="IconLocaltion" class="taskDetail-address-title-icon" />
<div class="taskDetail-address-title">{{ detail?.addressName ?? '' }}</div>
@@ -275,4 +275,12 @@
url: `${RouterPath.taskSubmitCheck}?id=${id}`,
});
}
+
+function goMap() {
+ Taro.openLocation({
+ latitude: detail.value?.latitude,
+ longitude: detail.value?.longitude,
+ scale: 18,
+ });
+}
</script>
diff --git a/packages/components/src/Calendar/Calendar.vue b/packages/components/src/Calendar/Calendar.vue
index acb8468..8a6df76 100644
--- a/packages/components/src/Calendar/Calendar.vue
+++ b/packages/components/src/Calendar/Calendar.vue
@@ -4,8 +4,6 @@
<nut-calendar-card
v-model="model"
class="bole-calendar"
- ref="calendar"
- @change="handleChange"
></nut-calendar-card>
</div>
<div :class="['bole-calendar-arrow', { active: !isCollapse }]" @click="toggle">
@@ -29,12 +27,6 @@
const model = defineModel<Date | Date[]>();
const { isCollapse, toggle } = useToggle(true);
-
-const calendar = ref();
-function handleChange(value) {
- console.log('value: ', value);
- console.log('calendar: ', calendar.value);
-}
</script>
<style lang="scss">
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 6003214..7f0b90f 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -157,6 +157,8 @@
/** 璧勬簮璇锋眰鏂瑰紡 */
export enum EnumResourceMethod {
+ /**鏃� */
+ None = 0,
/**鏌ヨ */
Get = 10,
/**鎻愪氦 */
diff --git a/packages/hooks/enterprise.ts b/packages/hooks/enterprise.ts
index 3217a6b..308786e 100644
--- a/packages/hooks/enterprise.ts
+++ b/packages/hooks/enterprise.ts
@@ -1,5 +1,5 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import * as enterpriseServices from '@12333/services/apiV2/enterprise';
+import * as taskServices from '@12333/services/apiV2/task';
import { MaybeRef, unref } from 'vue';
type UseEnterpriseDetailOptions = {
@@ -8,16 +8,16 @@
export function useEnterpriseDetail({ id }: UseEnterpriseDetailOptions) {
const { data, refetch, isLoading, isError } = useQuery({
- queryKey: ['enterpriseServices/getEnterprise', id],
+ queryKey: ['taskServices/getTaskEnterprise', id],
queryFn: async () => {
- return await enterpriseServices.getEnterprise(
+ return await taskServices.getTaskEnterprise(
{ id: unref(id) },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetEnterpriseQueryResult),
+ placeholderData: () => ({} as API.GetTaskEnterpriseQueryResult),
});
return {
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 38f65d3..57f4663 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -6,13 +6,13 @@
import * as user from './user';
import * as role from './role';
import * as enterprise from './enterprise';
+import * as resource from './resource';
import * as task from './task';
import * as ocrUtils from './ocrUtils';
import * as dictionary from './dictionary';
import * as userResume from './userResume';
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';
@@ -21,13 +21,13 @@
user,
role,
enterprise,
+ resource,
task,
ocrUtils,
dictionary,
userResume,
auth,
taskCheckReceive,
- resource,
taskUser,
menu,
fileUtils,
diff --git a/packages/services/apiV2/resource.ts b/packages/services/apiV2/resource.ts
index dc3ef94..ecc1ddc 100644
--- a/packages/services/apiV2/resource.ts
+++ b/packages/services/apiV2/resource.ts
@@ -2,6 +2,23 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍋ュ悍鏍￠獙 GET /api/user/resource/checkHealth */
+export async function checkHealth(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIcheckHealthParams,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/resource/checkHealth', {
+ method: 'GET',
+ params: {
+ ...params,
+ request: undefined,
+ ...params['request'],
+ },
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇璧勬簮瀛楁 GET /api/user/resource/getResourceFields */
export async function getResourceFields(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/packages/services/apiV2/task.ts b/packages/services/apiV2/task.ts
index 9488ff3..19f5179 100644
--- a/packages/services/apiV2/task.ts
+++ b/packages/services/apiV2/task.ts
@@ -83,6 +83,21 @@
);
}
+/** 鏌ヨ浠诲姟浼佷笟淇℃伅 GET /api/flexjob/task/getTaskEnterprise */
+export async function getTaskEnterprise(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetTaskEnterpriseParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetTaskEnterpriseQueryResult>('/api/flexjob/task/getTaskEnterprise', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ浠诲姟璇︽儏 GET /api/flexjob/task/getTaskInfo */
export async function getTaskInfo(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 3fc5b6f..f2a02ca 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -3,6 +3,11 @@
[key: string]: any;
}
+ interface APIcheckHealthParams {
+ /** 鍋ュ悍鏍￠獙 */
+ request?: CheckHealthQuery;
+ }
+
interface APIgetAliyunOSSAcsParams {
/** 鑾峰彇闃块噷浜慜SS鎺堟潈淇℃伅 */
request?: GetAliyunOSSAcsQuery;
@@ -144,6 +149,11 @@
roleId?: string;
}
+ interface APIgetTaskEnterpriseParams {
+ /** 浼佷笟Id */
+ id?: string;
+ }
+
interface APIgetTaskInfoParams {
/** Id */
id?: string;
@@ -241,6 +251,8 @@
/** 楠岃瘉鐮� */
verifyCode: string;
}
+
+ type CheckHealthQuery = Record<string, any>;
interface CheckReceiveTaskCommand {
/** 鎻愪氦Id */
@@ -448,6 +460,8 @@
}
enum EnumResourceMethod {
+ /**鏃� */
+ None = 0,
/**鏌ヨ */
Get = 10,
/**鎻愪氦 */
@@ -984,6 +998,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetRoleQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetTaskEnterpriseQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetTaskEnterpriseQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -2639,6 +2671,27 @@
isChecked?: boolean;
}
+ interface GetTaskEnterpriseQueryResult {
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: string;
+ /** 娉ㄥ唽璧勬湰 */
+ registeredCapital?: string;
+ /** 鎴愮珛鏃ユ湡 */
+ establishmentDate?: string;
+ /** 浼佷笟鍦板潃 */
+ address?: string;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ /** 鍦ㄦ嫑宀椾綅鏁伴噺 */
+ taskCount?: number;
+ }
+
interface GetTaskInfoQueryResult {
/** Id */
id?: string;
@@ -2648,6 +2701,8 @@
enterpriseName?: string;
/** 鑱旂郴鐢佃瘽 */
contactPhoneNumber?: string;
+ /** 鏄惁璁よ瘉 */
+ isReal?: boolean;
/** 鍦ㄦ嫑宀椾綅鏁伴噺 */
taskCount?: number;
/** 鎶ュ悕浜烘暟 */
@@ -3785,6 +3840,25 @@
type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>;
+ interface SyncOperationUserCommand {
+ dataSource?: EnumDataSource;
+ /** 鏁版嵁鏉ユ簮Id */
+ dataSourceId?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鐢ㄦ埛鍚� */
+ userName: string;
+ /** 鎵嬫満鍙� */
+ phoneNumber?: string;
+ /** 瀵嗙爜 */
+ password?: string;
+ /** 鍥尯Id */
+ industrialParkIds?: string[];
+ status?: EnumUserStatus;
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
interface UpdatePhoneNumberVerifyCodeCommand {
/** 鎵嬫満鍙风爜 */
phoneNumber: string;
diff --git a/packages/services/apiV2/user.ts b/packages/services/apiV2/user.ts
index 44bca4f..43f20b8 100644
--- a/packages/services/apiV2/user.ts
+++ b/packages/services/apiV2/user.ts
@@ -112,3 +112,18 @@
...(options || {}),
});
}
+
+/** 鍚屾杩愯惀鐢ㄦ埛 POST /api/user/user/syncOperationUser */
+export async function syncOperationUser(
+ body: API.SyncOperationUserCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/user/syncOperationUser', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
--
Gitblit v1.9.1