diff --git a/src/api/materials/materialReceive/types.ts b/src/api/materials/materialReceive/types.ts index bcd7850..c277afc 100644 --- a/src/api/materials/materialReceive/types.ts +++ b/src/api/materials/materialReceive/types.ts @@ -53,7 +53,6 @@ export interface MaterialReceiveVO { * 备注 */ remark: string; - } export interface MaterialReceiveForm extends BaseEntity { @@ -156,11 +155,13 @@ export interface MaterialReceiveForm extends BaseEntity { * 备注 */ remark?: string; - + /** + * 附件 + */ + attachmentId?: string | number; } export interface MaterialReceiveQuery extends PageQuery { - /** * 项目id */ @@ -201,11 +202,8 @@ export interface MaterialReceiveQuery extends PageQuery { */ supplierUnit?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts index 8698eff..2ea0534 100644 --- a/src/api/workflow/task/types.ts +++ b/src/api/workflow/task/types.ts @@ -31,6 +31,7 @@ export interface FlowTaskVO { version?: string; applyNode?: boolean; buttonList?: buttonList[]; + projectName?: string; } export interface buttonList { diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index 254e520..d74d7b8 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -12,7 +12,8 @@ export default { businessId: routerJumpVo.businessId, type: routerJumpVo.type, planMonth: routerJumpVo.planMonth, - taskId: routerJumpVo.taskId + taskId: routerJumpVo.taskId, + projectName: routerJumpVo.projectName } }); } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 3e7a71d..5b54a55 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -4,6 +4,7 @@ export interface RouterJumpVo { type: string; formCustom: string; formPath: string; + projectName?: string; } export interface StartProcessBo { diff --git a/src/components/Process/approvalButton.vue b/src/components/Process/approvalButton.vue index 545e96a..bccde71 100644 --- a/src/components/Process/approvalButton.vue +++ b/src/components/Process/approvalButton.vue @@ -1,15 +1,18 @@