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 @@
@@ -60,10 +60,10 @@ - + - + @@ -144,7 +144,7 @@ - + @@ -154,10 +154,10 @@ - + @@ -188,7 +188,7 @@ 上传新版本 DOCX - 支持多版本迭代。启用某个版本后,该版本的 DOCX 将用于生成新入职员工的合同。 + 支持多版本迭代。启用某个版本后,该版本的 DOCX 将用于生成新入职员工的签署材料。
@@ -274,7 +274,7 @@ - + - + @@ -439,7 +439,7 @@ - + @@ -630,7 +630,7 @@ const templateColumns: ColumnProps[] = [ }, { prop: "templateCode", label: "模板编码", minWidth: 160, search: { el: "input" } }, { prop: "templateName", label: "模板名称", minWidth: 200, search: { el: "input" } }, - { prop: "contractType", label: "合同类型", width: 140, search: { el: "input" } }, + { prop: "contractType", label: "材料类型", width: 140, search: { el: "input" } }, { prop: "status", label: "状态", @@ -738,7 +738,7 @@ async function saveTemplate() { || !templateForm.templateName || !templateForm.contractType ) { - return ElMessage.warning("请完整填写公司、部门、适用岗位及合同模板基本信息"); + return ElMessage.warning("请完整填写公司、部门、适用岗位及签署材料模板基本信息"); } await onboardingTaskApi.saveTemplate(templateForm, templateEditing.value); templateVisible.value = false; @@ -747,7 +747,7 @@ async function saveTemplate() { } async function removeTemplate(row: OnboardingContractTemplate) { - await ElMessageBox.confirm(`确认删除合同模板“${row.templateName}”?`, "删除确认", { type: "warning" }); + await ElMessageBox.confirm(`确认删除签署材料模板“${row.templateName}”?`, "删除确认", { type: "warning" }); await onboardingTaskApi.deleteTemplate([row.id]); templateTable.value?.refresh(); ElMessage.success("删除成功"); @@ -760,7 +760,7 @@ function openVersionCreate() { function beforeDocxUpload(file: File) { if (!file.name.toLowerCase().endsWith(".docx")) { - ElMessage.error("合同模板仅支持 DOCX 文件"); + ElMessage.error("签署材料模板仅支持 DOCX 文件"); return false; } return true; @@ -796,7 +796,7 @@ async function changeVersionStatus(row: OnboardingContractVersion, status: strin } async function removeVersion(row: OnboardingContractVersion) { - await ElMessageBox.confirm(`确认删除合同版本“${row.versionNo}”?此操作不可撤销。`, "删除确认", { type: "warning" }); + await ElMessageBox.confirm(`确认删除签署材料版本“${row.versionNo}”?此操作不可撤销。`, "删除确认", { type: "warning" }); await onboardingTaskApi.deleteVersion(row.id); await loadVersions(); ElMessage.success("版本删除成功"); @@ -819,7 +819,7 @@ async function downloadDocx(fileId?: number) { const encodedName = disposition.match(/filename\*=UTF-8\'\'([^;]+)/i)?.[1] || disposition.match(/filename="?([^";]+)"?/i)?.[1]; - let fileName = "合同模板.docx"; + let fileName = "签署材料模板.docx"; if (encodedName) { try { fileName = decodeURIComponent(encodedName.replace(/\+/g, "%20")); @@ -870,7 +870,7 @@ function variableTypeText(type: string) { const map: Record = { employee: "员工填写", company: "公司信息", - contract: "人事合同参数", + contract: "人事预设参数", system: "系统自动", unresolved: "待确认" }; diff --git a/src/views/biz/onboarding/employee/index.vue b/src/views/biz/onboarding/employee/index.vue index e9ee2b9..d77b51b 100644 --- a/src/views/biz/onboarding/employee/index.vue +++ b/src/views/biz/onboarding/employee/index.vue @@ -1,43 +1,32 @@ - {{ detail.employee.bankCardNumber || '-' }} + {{ detail.employee.bankCardNumber || "-" }} {{ detail.employee.bankAccountName || detail.employee.employeeName }} - {{ detail.employee.bankName || '-' }} + {{ detail.employee.bankName || "-" }} + + + + + {{ employeeInfo.emergencyContact || "-" }} + {{ employeeInfo.emergencyPhone || "-" }} + {{ employeeInfo.emergencyAddress || "-" }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + +
@@ -112,9 +171,14 @@ plain size="small" icon="Download" - @click="download(contract.generatedDocxFileId, `${detail?.employee?.employeeName || '员工'}_${contract.contractName || '入职合同'}.docx`)" + @click=" + download( + contract.generatedDocxFileId, + `${detail?.employee?.employeeName || '员工'}_${contract.contractName || '入职合同'}.docx` + ) + " > - 下载合同 DOCX + 下载签署材料 DOCX 尚未生成电子文件
@@ -127,21 +191,13 @@
- +
{{ auditActionText(item.auditAction) }} (操作人:{{ item.createUser }})
-
- 审核意见:{{ item.auditOpinion }} -
+
审核意见:{{ item.auditOpinion }}
@@ -157,25 +213,33 @@ @@ -341,6 +413,7 @@ async function download(fileId: number, fallbackFileName?: string) { } .section-card { + flex-wrap: wrap; border-radius: 8px; border: 1px solid #e2e8f0; } diff --git a/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue b/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue index 3e79bf3..d9f57d1 100644 --- a/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue +++ b/src/views/biz/onboarding/entry-config/components/OnboardingTemplatePanel.vue @@ -60,7 +60,7 @@ 新增入职模板
-
@@ -78,7 +78,7 @@ @@ -186,7 +186,7 @@