From 5a7cf72a6856944769c98809d07bd230d32de2cf Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 20 Nov 2025 16:56:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(erp):=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E5=8F=8A=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整erpProjectChange、erpProjectPlan中bizExt字段,项目变更和计划编码使用对应编号,标题使用项目名称 - 优化projectAcceptance和projectReceiving页面中el-select、el-date-picker及代码格式 - 统一import语句和变量声明的分号使用,提升代码一致性 - 实现相关表单增加字段校验和日期默认值初始化 - 细化表单提交逻辑,权限检查仅允许项目经理操作(超级管理员除外) - 优化流程状态规范及审批流程相关逻辑,完善业务状态映射 - 细化流程提交和暂存时bizExt的title和code字段传递,确保流程准确追踪 - 统一代码风格和格式,提升可读性与维护性 --- src/views/oa/erp/erpProjectChange/edit.vue | 6 +- src/views/oa/erp/erpProjectPlan/edit.vue | 5 +- src/views/oa/erp/projectAcceptance/edit.vue | 270 +++++++++++--------- src/views/oa/erp/projectReceiving/edit.vue | 255 +++++++++--------- 4 files changed, 298 insertions(+), 238 deletions(-) diff --git a/src/views/oa/erp/erpProjectChange/edit.vue b/src/views/oa/erp/erpProjectChange/edit.vue index 739eb6d..ad23ffb 100644 --- a/src/views/oa/erp/erpProjectChange/edit.vue +++ b/src/views/oa/erp/erpProjectChange/edit.vue @@ -491,10 +491,10 @@ const handleSave = async (action: 'draft' | 'submit') => { deptHeadId: form.value.deptHeadId, changeType: form.value.changeType }; - // 流程实例业务扩展字段 + // 流程实例业务扩展字段:编码使用项目变更编号,标题使用项目名称 form.value.bizExt = { - businessTitle: '项目计划变更申请', - businessCode: form.value.projectCode + businessTitle: form.value.projectName, + businessCode: form.value.projectChangeCode }; await submitProjectChangeAndFlowStart(form.value); proxy?.$modal.msgSuccess('提交成功'); diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue b/src/views/oa/erp/erpProjectPlan/edit.vue index de951a9..56ae31c 100644 --- a/src/views/oa/erp/erpProjectPlan/edit.vue +++ b/src/views/oa/erp/erpProjectPlan/edit.vue @@ -648,9 +648,10 @@ const submitForm = async (status = 'draft') => { projectName: project?.projectName, managerId: form.value.managerId }; + // 流程实例业务扩展字段:编码使用项目计划编号,标题使用项目名称 form.value.bizExt = { - businessTitle: '项目计划审批', - businessCode: project?.projectName + businessTitle: project?.projectName, + businessCode: form.value.projectPlanCode }; form.value.projectPlanStatus = '2'; form.value.flowStatus = 'waiting'; diff --git a/src/views/oa/erp/projectAcceptance/edit.vue b/src/views/oa/erp/projectAcceptance/edit.vue index 5b8d6fd..efdd58b 100644 --- a/src/views/oa/erp/projectAcceptance/edit.vue +++ b/src/views/oa/erp/projectAcceptance/edit.vue @@ -23,8 +23,21 @@ - - + + @@ -38,10 +51,16 @@ - + - + @@ -71,43 +90,48 @@ - diff --git a/src/views/oa/erp/projectReceiving/edit.vue b/src/views/oa/erp/projectReceiving/edit.vue index a948608..91a10f7 100644 --- a/src/views/oa/erp/projectReceiving/edit.vue +++ b/src/views/oa/erp/projectReceiving/edit.vue @@ -23,8 +23,21 @@ - - + + @@ -74,39 +87,45 @@