diff --git a/src/api/oa/erp/projectInfo/types.ts b/src/api/oa/erp/projectInfo/types.ts index 7c5f936..0e79ac0 100644 --- a/src/api/oa/erp/projectInfo/types.ts +++ b/src/api/oa/erp/projectInfo/types.ts @@ -4,6 +4,16 @@ export interface ProjectInfoVO { */ projectId: string | number; + /** + * 父项目ID(子项目指向研发主项目) + */ + parentProjectId?: string | number; + + /** + * 是否含有子项目(0否 1是,仅研发主项目使用;子项目行一般为0) + */ + subProjectFlag?: string; + /** * 有无合同(1有 2无) */ @@ -204,6 +214,16 @@ export interface ProjectInfoForm extends BaseEntity { */ projectId?: string | number; + /** + * 父项目ID(子项目必填,主项目为空) + */ + parentProjectId?: string | number; + + /** + * 是否含有子项目(0否 1是,主项目;子项目存0) + */ + subProjectFlag?: string; + /** * 有无合同(1有 2无) */ @@ -576,4 +596,14 @@ export interface ProjectInfoQuery extends PageQuery { * 创建人用户ID */ createBy?: string | number; + + /** + * 父项目ID + */ + parentProjectId?: string | number; + + /** + * 是否研发子项目(0否 1是) + */ + subProjectFlag?: string; } diff --git a/src/views/oa/erp/projectInfo/devEdit.vue b/src/views/oa/erp/projectInfo/devEdit.vue index 80b5f9d..22bc557 100644 --- a/src/views/oa/erp/projectInfo/devEdit.vue +++ b/src/views/oa/erp/projectInfo/devEdit.vue @@ -17,18 +17,11 @@ - - - - - - - @@ -38,13 +31,6 @@ - - - - - - - @@ -52,29 +38,17 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -96,13 +70,6 @@ - - - - - - - @@ -110,20 +77,6 @@ - - - - - - - - - - - - - - - - + - - + - - - + + - + - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - - - - @@ -262,25 +143,23 @@ diff --git a/src/views/oa/erp/projectInfo/index.vue b/src/views/oa/erp/projectInfo/index.vue index c9bf654..ad90736 100644 --- a/src/views/oa/erp/projectInfo/index.vue +++ b/src/views/oa/erp/projectInfo/index.vue @@ -111,7 +111,7 @@ - +