From e2697b4bdb869ca76804eedec4275c4e3769fc1b Mon Sep 17 00:00:00 2001 From: fuenmao <980740792@qq.com> Date: Fri, 28 Aug 2026 17:32:47 +0800 Subject: [PATCH] 1111 --- .env.production | 4 +- src/api/modules/biz/onboarding.ts | 4 +- src/views/biz/onboarding/contract/index.vue | 42 +-- src/views/biz/onboarding/employee/index.vue | 247 ++++++++++++------ .../components/OnboardingTemplatePanel.vue | 10 +- .../components/VariableDefinitionPanel.vue | 6 +- src/views/biz/onboarding/setup/index.vue | 12 +- src/views/biz/onboarding/task/index.vue | 46 ++-- src/views/onboarding/fill/index.vue | 52 ++-- 9 files changed, 249 insertions(+), 174 deletions(-) diff --git a/.env.production b/.env.production index ab13cea..c87dc05 100644 --- a/.env.production +++ b/.env.production @@ -25,10 +25,10 @@ VITE_PWA = true VITE_HTTP_PROXY = true # 线上环境接口地址 -VITE_API_URL = http://medical.23544.com:7106/ +VITE_API_URL = https://onboardx-api.cnzhyx.cn/ # 开发环境跨域代理,支持配置多个 -VITE_PROXY = [["/api","http://medical.23544.com:7106/"]] +VITE_PROXY = [["/api","https://onboardx-api.cnzhyx.cn/"]] #是否启用mqtt VITE_MQTT = false diff --git a/src/api/modules/biz/onboarding.ts b/src/api/modules/biz/onboarding.ts index 23fc3a9..79717fb 100644 --- a/src/api/modules/biz/onboarding.ts +++ b/src/api/modules/biz/onboarding.ts @@ -145,13 +145,15 @@ export interface OnboardingEmployee { employeeNo?: string; employeeName: string; companyId: number; + companyName?: string; departmentId?: number; departmentName?: string; positionId: number; + positionName?: string; phone: string; idCardNumber: string; entryDate?: string; - createTime: string; + createTime?: string; } export interface OnboardingFormField { diff --git a/src/views/biz/onboarding/contract/index.vue b/src/views/biz/onboarding/contract/index.vue index e1c16d3..f07c56c 100644 --- a/src/views/biz/onboarding/contract/index.vue +++ b/src/views/biz/onboarding/contract/index.vue @@ -2,13 +2,13 @@