diff --git a/src/api/oa/erp/contractChange/index.ts b/src/api/oa/erp/contractChange/index.ts index f67c40b..9ac8ccb 100644 --- a/src/api/oa/erp/contractChange/index.ts +++ b/src/api/oa/erp/contractChange/index.ts @@ -94,7 +94,7 @@ export const saveContractChange = (data: ContractChangeSaveForm): AxiosPromise => { + return request({ + url: '/oa/erp/contractChange/submitContentChange', + method: 'post', + data + }); +}; + /** * 查询合同变更详情(主表+信息+物料+付款方式) * @param contractChangeId diff --git a/src/api/oa/erp/contractChange/types.ts b/src/api/oa/erp/contractChange/types.ts index 6bed241..0b68221 100644 --- a/src/api/oa/erp/contractChange/types.ts +++ b/src/api/oa/erp/contractChange/types.ts @@ -9,6 +9,11 @@ export interface ContractChangeVO { */ contractId: string | number; + /** + * 内容变更生成的新合同ID(仅变更类型=1时返回) + */ + newContractId?: string | number; + /** * 变更单编号 */ @@ -172,6 +177,11 @@ export interface ContractChangeForm extends BaseEntity { */ contractId?: string | number; + /** + * 内容变更生成的新合同ID(仅变更类型=1时返回) + */ + newContractId?: string | number; + /** * 变更单编号 */ @@ -289,6 +299,7 @@ export interface ContractChangeSaveForm { contractChangeId?: string | number; contractId: string | number; changeType: string; + newContractId?: string | number; changeCode?: string; changeReason: string; applyTime?: string; diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts index 23a1fcf..53f3ff7 100644 --- a/src/api/oa/erp/contractInfo/types.ts +++ b/src/api/oa/erp/contractInfo/types.ts @@ -209,6 +209,11 @@ export interface ContractInfoVO { */ contractTemplateFlag: string; + /** + * 内容变更来源的原合同ID(仅当本合同由合同内容变更生成时非空) + */ + originalContractId?: string | number; + } export interface ContractInfoForm extends BaseEntity { diff --git a/src/views/oa/erp/contractChange/edit.vue b/src/views/oa/erp/contractChange/edit.vue index bb710e5..5cac341 100644 --- a/src/views/oa/erp/contractChange/edit.vue +++ b/src/views/oa/erp/contractChange/edit.vue @@ -1,7 +1,7 @@