diff --git a/src/api/oa/crm/crmQuoteInfo/types.ts b/src/api/oa/crm/crmQuoteInfo/types.ts index bb355ba..8dc0a25 100644 --- a/src/api/oa/crm/crmQuoteInfo/types.ts +++ b/src/api/oa/crm/crmQuoteInfo/types.ts @@ -39,6 +39,11 @@ export interface CrmQuoteInfoVO { */ quoteDeptId: string | number; + /** + * 部门名称 + */ + deptName?: string; + /** * 报价日期 */ @@ -114,6 +119,11 @@ export interface CrmQuoteInfoVO { */ customerContactId: string | number; + /** + * 客户名称(通过联系人关联客户得到) + */ + customerName: string; + /** * 客户方联系人 */ @@ -382,7 +392,7 @@ export interface CrmQuoteInfoForm extends BaseEntity { */ itemsBo?: CrmQuoteMaterialForm[]; - /** + /** * 供应商名称 */ supplierName?: string; @@ -392,10 +402,24 @@ export interface CrmQuoteInfoForm extends BaseEntity { */ createName?: string; + /** + * 流程编码 + */ + flowCode?: any; + + /** + * 流程变量 + */ + variables?: any; + + /** + * 流程业务扩展 + */ + bizExt?: any; + } export interface CrmQuoteInfoQuery extends PageQuery { - /** * 报价单号 */ @@ -571,7 +595,7 @@ export interface CrmQuoteInfoQuery extends PageQuery { */ params?: any; - /** + /** * 供应商名称 */ supplierName?: string; @@ -580,12 +604,7 @@ export interface CrmQuoteInfoQuery extends PageQuery { * 创建人别称 */ createName?: string; - } - -import type { CrmQuoteMaterialVO, CrmQuoteMaterialForm } from '@/api/oa/crm/crmQuoteMaterial/types'; - - - +import type { CrmQuoteMaterialForm, CrmQuoteMaterialVO } from '@/api/oa/crm/crmQuoteMaterial/types'; diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts index 2722db2..c7bb504 100644 --- a/src/enums/OAEnum.ts +++ b/src/enums/OAEnum.ts @@ -54,6 +54,11 @@ export enum FlowCodeEnum { */ CONTRACT_CODE = 'OAC', + /** + * 报价单标识KEY + */ + QUOTE_CODE = 'OACQ', + /** * 项目采购标识KEY */ @@ -63,6 +68,20 @@ export enum FlowCodeEnum { * 市场项目标识KEY */ PROJECT_KEY = 'xmsq', - - + /** + * 项目计划标识KEY + */ + PROJECT_PLAN_CODE = 'OAPS', + /** + * 项目计划变更标识KEY + */ + PROJECT_PLAN_CHANGE_CODE = 'OAEP', + /** + * 项目收货确认标识KEY + */ + PROJECT_RECEIVING_CODE = 'OAPR', + /** + * 项目验收确认标识KEY + */ + PROJECT_ACCEPTANCE_CODE = 'OAPA', } diff --git a/src/views/oa/erp/erpProjectChange/edit.vue b/src/views/oa/erp/erpProjectChange/edit.vue index ad23ffb..1a998e7 100644 --- a/src/views/oa/erp/erpProjectChange/edit.vue +++ b/src/views/oa/erp/erpProjectChange/edit.vue @@ -239,6 +239,7 @@ import SubmitVerify from '@/components/Process/submitVerify.vue'; import ApprovalRecord from '@/components/Process/approvalRecord.vue'; import ApprovalButton from '@/components/Process/approvalButton.vue'; import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo'; +import { FlowCodeEnum } from '@/enums/OAEnum'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { project_category, change_type, project_phases } = toRefs(proxy?.useDict('project_category', 'change_type', 'project_phases')); @@ -481,7 +482,7 @@ const handleSave = async (action: 'draft' | 'submit') => { submitLoading.value = true; try { // 设置流程编码 - form.value.flowCode = 'OAEP'; + form.value.flowCode = FlowCodeEnum.PROJECT_PLAN_CHANGE_CODE; //OAEP // 流程变量 form.value.variables = { projectId: form.value.projectId, diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue b/src/views/oa/erp/erpProjectPlan/edit.vue index fc99831..da71bff 100644 --- a/src/views/oa/erp/erpProjectPlan/edit.vue +++ b/src/views/oa/erp/erpProjectPlan/edit.vue @@ -300,6 +300,7 @@ import type { ProjectInfoVO } from '@/api/oa/erp/projectInfo/types'; import SubmitVerify from '@/components/Process/submitVerify.vue'; import ApprovalRecord from '@/components/Process/approvalRecord.vue'; import { useUserStore } from '@/store/modules/user'; +import { FlowCodeEnum } from '@/enums/OAEnum'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { project_plan_status, project_phases, collection_stage, project_change_status } = toRefs( @@ -629,7 +630,7 @@ const submitForm = async (status = 'draft') => { // 提交审批 if (status === 'submit') { const project = projectInfoList.value.find((p) => p.projectId === form.value.projectId); - form.value.flowCode = 'OAPS'; + form.value.flowCode = FlowCodeEnum.PROJECT_PLAN_CODE; //OAPS form.value.variables = { projectId: form.value.projectId, projectName: project?.projectName, diff --git a/src/views/oa/erp/projectAcceptance/edit.vue b/src/views/oa/erp/projectAcceptance/edit.vue index efdd58b..d3b36de 100644 --- a/src/views/oa/erp/projectAcceptance/edit.vue +++ b/src/views/oa/erp/projectAcceptance/edit.vue @@ -107,6 +107,7 @@ import { updateProjectAcceptance } from '@/api/oa/erp/projectAcceptance'; import type { ProjectAcceptanceForm } from '@/api/oa/erp/projectAcceptance/types'; +import { FlowCodeEnum } from '@/enums/OAEnum'; import SubmitVerify from '@/components/Process/submitVerify.vue'; const { proxy } = getCurrentInstance() as any; @@ -147,7 +148,7 @@ const initFormData: ProjectAcceptanceForm = { deputyId: undefined, deputyName: undefined as any, remark: undefined, - flowCode: 'OAPA', + flowCode: FlowCodeEnum.PROJECT_ACCEPTANCE_CODE, variables: {}, bizExt: {} }; @@ -245,7 +246,7 @@ const submitForm = (status: string, mode: boolean) => { const variables: any = { managerId: form.value.managerId, managerName: form.value.projectManagerName }; const payload: ProjectAcceptanceForm = { ...form.value, - flowCode: 'OAPA', + flowCode: FlowCodeEnum.PROJECT_ACCEPTANCE_CODE, //OAPA variables, bizExt: { businessCode: form.value.acceptanceCode, businessTitle: form.value.projectName } } as any; @@ -276,7 +277,7 @@ const submitAndStartFlow = async () => { try { const payload: ProjectAcceptanceForm = { ...form.value, - flowCode: 'OAPA', + flowCode: FlowCodeEnum.PROJECT_ACCEPTANCE_CODE, //OAPA variables: {}, bizExt: { businessCode: form.value.acceptanceCode, businessTitle: form.value.projectName } } as any; diff --git a/src/views/oa/erp/projectReceiving/edit.vue b/src/views/oa/erp/projectReceiving/edit.vue index 91a10f7..93b8bb2 100644 --- a/src/views/oa/erp/projectReceiving/edit.vue +++ b/src/views/oa/erp/projectReceiving/edit.vue @@ -101,6 +101,7 @@ import { updateProjectReceiving } from '@/api/oa/erp/projectReceiving'; import type { ProjectReceivingForm } from '@/api/oa/erp/projectReceiving/types'; +import { FlowCodeEnum } from '@/enums/OAEnum'; import SubmitVerify from '@/components/Process/submitVerify.vue'; const { proxy } = getCurrentInstance() as any; @@ -142,7 +143,7 @@ const initFormData: ProjectReceivingForm = { deputyId: undefined, deputyName: undefined as any, remark: undefined, - flowCode: 'OAPR', + flowCode: FlowCodeEnum.PROJECT_RECEIVING_CODE, variables: {}, bizExt: {} }; @@ -246,7 +247,7 @@ const submitForm = (status: string, mode: boolean) => { const variables: any = { managerId: form.value.managerId, managerName: form.value.projectManagerName }; const payload: ProjectReceivingForm = { ...form.value, - flowCode: 'OAPR', + flowCode: FlowCodeEnum.PROJECT_RECEIVING_CODE, //OAPR variables, bizExt: { businessCode: form.value.receivingCode, businessTitle: form.value.projectName } } as any; @@ -277,7 +278,7 @@ const submitAndStartFlow = async () => { try { const payload: ProjectReceivingForm = { ...form.value, - flowCode: 'OAPR', + flowCode: FlowCodeEnum.PROJECT_RECEIVING_CODE, //OAPR variables: {}, bizExt: { businessCode: form.value.receivingCode, businessTitle: form.value.projectName } } as any;