From 3f6885f09637a66447ab3925ec091f40e02baf47 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 20 Nov 2025 11:02:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(erp):=20=E7=A7=BB=E9=99=A4=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=8F=8A=E6=94=B6=E8=B4=A7=E7=A1=AE=E8=AE=A4=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了验收确认编号手动生成按钮及相关代码 - 删除了收货确认编号手动生成按钮及相关代码 - 表单中对应编号输入框改为显示系统自动生成提示 - 移除了对编号生成接口的调用及状态管理逻辑 - 简化了项目验收和收货页面代码结构 --- src/views/oa/erp/projectAcceptance/edit.vue | 33 +---------------- src/views/oa/erp/projectReceiving/edit.vue | 39 +++------------------ 2 files changed, 5 insertions(+), 67 deletions(-) diff --git a/src/views/oa/erp/projectAcceptance/edit.vue b/src/views/oa/erp/projectAcceptance/edit.vue index 27cd7cf..5b8d6fd 100644 --- a/src/views/oa/erp/projectAcceptance/edit.vue +++ b/src/views/oa/erp/projectAcceptance/edit.vue @@ -18,13 +18,7 @@ - - - + @@ -88,7 +82,6 @@ import { useRoute } from 'vue-router' import { useUserStore } from '@/store/modules/user' import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo' import { getProjectAcceptance, addProjectAcceptance, updateProjectAcceptance, submitProjectAcceptanceAndFlowStart, prepareProjectAcceptanceByProjectId } from '@/api/oa/erp/projectAcceptance' -import { getRuleGenerateCode } from '@/api/system/codeRule' import type { ProjectAcceptanceForm } from '@/api/oa/erp/projectAcceptance/types' import SubmitVerify from '@/components/Process/submitVerify.vue' @@ -136,7 +129,6 @@ const initFormData: ProjectAcceptanceForm = { } const form = ref({ ...initFormData }) -const isCodeGenerated = ref(false) const normalizeFlowStatus = (status?: string) => { if (!status) return 'draft' @@ -198,7 +190,6 @@ const applyLeaderFromManager = () => { const res = await getProjectAcceptance(routeParams.id as any) Object.assign(form.value, res.data) selectedProjectId.value = form.value.projectId - isCodeGenerated.value = !!form.value.acceptanceCode } const submitForm = (status: string, mode: boolean) => { @@ -277,28 +268,6 @@ const formDisabled = computed(() => { return pageTypeForButton.value === 'view' || pageTypeForButton.value === 'approval' || byStatus }) -const generateAcceptanceCode = async () => { - // 仅在可编辑且尚未生成编号时才允许生成 - if (formDisabled.value) return - if (isCodeGenerated.value) return - - try { - const params = { codeRuleCode: '1008' } as any - const res = await getRuleGenerateCode(params) - // 后端将生成的编号放在 msg，与项目/合同/报价保持一致 - form.value.acceptanceCode = res?.msg as any - isCodeGenerated.value = !!form.value.acceptanceCode - if (form.value.acceptanceCode) { - proxy?.$modal.msgSuccess('验收确认编号生成成功') - } else { - proxy?.$modal.msgError('验收确认编号生成失败') - } - } catch (error) { - console.error('生成验收确认编号失败:', error) - proxy?.$modal.msgError('生成验收确认编号失败') - } -} - onMounted(async () => { // 初始化页面模式与任务ID，优先使用 path 中的 :acceptanceId，其次使用 query.id routeParams.id = (route.params.acceptanceId || route.query.id) as any diff --git a/src/views/oa/erp/projectReceiving/edit.vue b/src/views/oa/erp/projectReceiving/edit.vue index 88c7e58..a948608 100644 --- a/src/views/oa/erp/projectReceiving/edit.vue +++ b/src/views/oa/erp/projectReceiving/edit.vue @@ -18,13 +18,7 @@ - - - + @@ -44,7 +38,7 @@ - + @@ -87,7 +81,6 @@ import { useRoute } from 'vue-router' import { useUserStore } from '@/store/modules/user' import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo' import { getProjectReceiving, addProjectReceiving, updateProjectReceiving, submitProjectReceivingAndFlowStart, prepareProjectReceivingByProjectId } from '@/api/oa/erp/projectReceiving' -import { getRuleGenerateCode } from '@/api/system/codeRule' import type { ProjectReceivingForm } from '@/api/oa/erp/projectReceiving/types' import SubmitVerify from '@/components/Process/submitVerify.vue' @@ -122,7 +115,7 @@ const initFormData: ProjectReceivingForm = { projectName: undefined, managerId: undefined, projectManagerName: undefined, - + arrivalDate: undefined, ossId: undefined, chargeId: undefined, @@ -136,7 +129,6 @@ const initFormData: ProjectReceivingForm = { } const form = ref({ ...initFormData }) -const isCodeGenerated = ref(false) const normalizeFlowStatus = (status?: string) => { if (!status) return 'draft' @@ -204,7 +196,6 @@ const applyLeaderFromManager = () => { const res = await getProjectReceiving(routeParams.id as any) Object.assign(form.value, res.data) selectedProjectId.value = form.value.projectId - isCodeGenerated.value = !!form.value.receivingCode } const submitForm = (status: string, mode: boolean) => { @@ -225,7 +216,7 @@ const submitForm = (status: string, mode: boolean) => { // 参考项目信息：显式设置流程状态为 draft form.value.flowStatus = 'draft' as any form.value.receivingStatus = '1' // 业务状态：暂存 - + if (form.value.receivingId) { await updateProjectReceiving(form.value) } else { @@ -283,28 +274,6 @@ const formDisabled = computed(() => { return pageTypeForButton.value === 'view' || pageTypeForButton.value === 'approval' || byStatus }) -const generateReceivingCode = async () => { - // 仅在可编辑且尚未生成编号时才允许生成 - if (formDisabled.value) return - if (isCodeGenerated.value) return - - try { - const params = { codeRuleCode: '1009' } as any - const res = await getRuleGenerateCode(params) - // 后端将生成的编号放在 msg，与项目/合同/报价保持一致 - form.value.receivingCode = res?.msg as any - isCodeGenerated.value = !!form.value.receivingCode - if (form.value.receivingCode) { - proxy?.$modal.msgSuccess('收货确认编号生成成功') - } else { - proxy?.$modal.msgError('收货确认编号生成失败') - } - } catch (error) { - console.error('生成收货确认编号失败:', error) - proxy?.$modal.msgError('生成收货确认编号失败') - } -} - onMounted(async () => { // 初始化页面模式与任务ID，优先使用 path 中的 :receivingId，其次使用 query.id routeParams.id = (route.params.receivingId || route.query.id) as any