diff --git a/src/api/oa/crm/customerInfo/types.ts b/src/api/oa/crm/customerInfo/types.ts index 130de92..750ba1c 100644 --- a/src/api/oa/crm/customerInfo/types.ts +++ b/src/api/oa/crm/customerInfo/types.ts @@ -49,16 +49,21 @@ export interface CustomerInfoVO { */ ownerName?: string; + /** + * 注册地/单位地址 + */ + registeredAddress?: string; + + /** + * 电话号码 + */ + phoneNumber?: string; + /** * 办公地 */ detailedAddress: string; - /** - * 注册地 - */ - registeredAddress?: string; - /** * 商务联系人 */ @@ -193,10 +198,15 @@ export interface CustomerInfoForm extends BaseEntity { detailedAddress?: string; /** - * 注册地 + * 注册地/单位地址 */ registeredAddress?: string; + /** + * 电话号码 + */ + phoneNumber?: string; + /** * 商务联系人 */ @@ -277,6 +287,11 @@ export interface CustomerInfoForm extends BaseEntity { */ ourCompanyFlag?: string; + /** + * 电话号码 + */ + phoneNumber?: string; + } export interface CustomerInfoQuery extends PageQuery { diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue index b8792e0..17a0078 100644 --- a/src/views/oa/erp/contractInfo/edit.vue +++ b/src/views/oa/erp/contractInfo/edit.vue @@ -1120,36 +1120,12 @@ const handleFile = () => { /** 提交按钮 */ const submitForm = (status: string, mode: boolean) => { try { - buttonLoading.value = true; contractInfoFormRef.value?.validate(async (valid: boolean) => { if (valid) { + buttonLoading.value = true; // 设置后端发起和不等于草稿状态 直接走流程发起 if (status != 'draft') { - // 后端发起流程模式 - form.value.flowCode = FlowCodeEnum.CONTRACT_CODE; - // 流程变量 - /*智能轮胎 默认审批人:董兰飞,默认抄送陈海军、张东辉。 - 轮胎&制品 默认审批人:佟强,默认抄送陈海军、张东辉。 - 快递&新零售 默认审批人:张东辉,默认抄送陈海军 - 制造大集成 默认审批人:祁海波,默认抄送陈海军、张东辉 - 工厂数字化 默认审批人:尹治丰,默认抄送陈海军、张东辉*/ - const recipientUserId = form.value.businessDirection == '3' ? '1985254723705556993' : '1985254723705556993,1985251968270127105'; - - form.value.variables = { - contractName: form.value.contractName, - totalPrice: form.value.totalPrice, - businessDirection: form.value.businessDirection, - contractDeptId: form.value.contractDeptId, - recipientUserId: recipientUserId, - contractCode: form.value.contractCode - }; - // 流程实例业务扩展字段 - form.value.bizExt = { - businessTitle: '合同审批', - businessCode: form.value.contractCode - }; - form.value.contractStatus = '2'; - form.value.flowStatus = 'waiting'; + // 走流程所需的 flowCode/variables/bizExt/状态字段,由后端 contractSubmitAndFlowStart 统一补齐并落库 const res = await contractSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false)); form.value = res.data; proxy?.$modal.msgSuccess('操作成功'); @@ -1171,6 +1147,8 @@ const submitForm = (status: string, mode: boolean) => { } } }); + } catch (e) { + console.error(e); } finally { buttonLoading.value = false; }