diff --git a/src/api/apply/apply/index.ts b/src/api/apply/apply/index.ts index 5ca1e4a09..ce1aa7335 100644 --- a/src/api/apply/apply/index.ts +++ b/src/api/apply/apply/index.ts @@ -1,8 +1,8 @@ import request from '@/config/axios' -// 立项申请 VO +// 立项申请主 VO export interface MainVO { - id: string // id + id: number // id number: string // 编号 name: string // 项目名称 technicalField: string // 所属技术领域 @@ -27,36 +27,48 @@ export interface MainVO { competentDeptName: string // 主管部门 managerId: string // 主管工程师ID managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: string // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: string // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: string // 审核单位ID + state: string // 状态 + creator: string // 创建人 + createTime: Date // 创建时间 + updater: string // 更新人 + updateTime: Date // 更新时间 + deleted: number // 是否删除 } -// 立项申请 API +// 立项申请主 API export const MainApi = { - // 查询立项申请分页 + // 查询立项申请主分页 getMainPage: async (params: any) => { return await request.get({ url: `/apply/main/page`, params }) }, - // 查询立项申请详情 + // 查询立项申请主详情 getMain: async (id: number) => { return await request.get({ url: `/apply/main/get?id=` + id }) }, - // 新增立项申请 + // 新增立项申请主 createMain: async (data: MainVO) => { return await request.post({ url: `/apply/main/create`, data }) }, - // 修改立项申请 + // 修改立项申请主 updateMain: async (data: MainVO) => { return await request.put({ url: `/apply/main/update`, data }) }, - // 删除立项申请 + // 删除立项申请主 deleteMain: async (id: number) => { return await request.delete({ url: `/apply/main/delete?id=` + id }) }, - // 导出立项申请 Excel + // 导出立项申请主 Excel exportMain: async (params) => { return await request.download({ url: `/apply/main/export-excel`, params }) }, diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue index e34084c62..3582771b5 100644 --- a/src/views/apply/apply/MainForm.vue +++ b/src/views/apply/apply/MainForm.vue @@ -14,14 +14,7 @@ - - - + @@ -35,12 +28,7 @@ /> - + @@ -82,20 +70,66 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,7 +156,6 @@ + \ No newline at end of file diff --git a/src/views/apply/apply/components/FundsForm.vue b/src/views/apply/apply/components/FundsForm.vue index ee5910207..031d0e96c 100644 --- a/src/views/apply/apply/components/FundsForm.vue +++ b/src/views/apply/apply/components/FundsForm.vue @@ -23,10 +23,10 @@ - + @@ -51,44 +51,6 @@ - - - - - - - - - - - - @@ -68,10 +68,6 @@ watch( roadmap: undefined, innovation: undefined, riskAnalysis: undefined, - createdBy: undefined, - createdTime: undefined, - updatedBy: undefined, - updatedTime: undefined, } // 2. val 非空,则加载数据 if (!val) { @@ -102,4 +98,4 @@ const getData = () => { } defineExpose({ validate, getData }) - + \ No newline at end of file diff --git a/src/views/apply/apply/components/ParticipantForm.vue b/src/views/apply/apply/components/ParticipantForm.vue index 003fe6b43..9e50d8e1d 100644 --- a/src/views/apply/apply/components/ParticipantForm.vue +++ b/src/views/apply/apply/components/ParticipantForm.vue @@ -81,16 +81,16 @@