diff --git a/src/api/oa/erp/contractChange/index.ts b/src/api/oa/erp/contractChange/index.ts index 507cc6b..f67c40b 100644 --- a/src/api/oa/erp/contractChange/index.ts +++ b/src/api/oa/erp/contractChange/index.ts @@ -93,6 +93,20 @@ export const saveContractChange = (data: ContractChangeSaveForm): AxiosPromise => { + return request({ + url: '/oa/erp/contractChange/contractChangeSubmitAndFlowStart', + method: 'post', + data + }); +}; + /** * 查询合同变更详情(主表+信息+物料+付款方式) * @param contractChangeId diff --git a/src/api/oa/erp/contractChange/types.ts b/src/api/oa/erp/contractChange/types.ts index 36ab829..ad03100 100644 --- a/src/api/oa/erp/contractChange/types.ts +++ b/src/api/oa/erp/contractChange/types.ts @@ -301,6 +301,12 @@ export interface ContractChangeSaveForm { changeInfo?: any; changeMaterialList?: any[]; changePaymentMethodList?: any[]; + /** 流程定义编码(提交审批时) */ + flowCode?: string; + /** 流程变量(提交审批时) */ + variables?: Record; + /** 流程实例业务扩展(提交审批时) */ + bizExt?: { businessTitle?: string; businessCode?: string; businessId?: string }; } /** 合同变更详情(主表+信息+物料+付款方式) */ diff --git a/src/components/ContractSelect/index.vue b/src/components/ContractSelect/index.vue new file mode 100644 index 0000000..fc5aa69 --- /dev/null +++ b/src/components/ContractSelect/index.vue @@ -0,0 +1,241 @@ + + + + diff --git a/src/views/oa/erp/contractChange/edit.vue b/src/views/oa/erp/contractChange/edit.vue index 905124b..0ef37a8 100644 --- a/src/views/oa/erp/contractChange/edit.vue +++ b/src/views/oa/erp/contractChange/edit.vue @@ -20,6 +20,9 @@ 返回 + + + {{ dict.label }} @@ -393,76 +396,7 @@ - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - -
-
合同详情
- -
点击左侧列表行可查看合同详情
-
-
-
- -
+ @@ -472,9 +406,9 @@ diff --git a/src/views/oa/erp/contractChange/index.vue b/src/views/oa/erp/contractChange/index.vue index 526755c..98073c4 100644 --- a/src/views/oa/erp/contractChange/index.vue +++ b/src/views/oa/erp/contractChange/index.vue @@ -82,15 +82,12 @@ @@ -169,6 +166,12 @@ const handleAdd = () => { }); }; +/** 状态不为1(草稿)时可查看详情 */ +const canViewDetail = (row: ContractChangeVO) => { + const status = row?.changeStatus; + return status != null && Number(status) !== 1; +}; + /** 查看详情:使用菜单路由打开 */ const handleView = (row?: ContractChangeVO) => { const _contractChangeId = row?.contractChangeId || ids.value[0];