From 34fa38272667de1b60e2d0b55fbd4ec456a32efb Mon Sep 17 00:00:00 2001 From: lizilong Date: Mon, 15 Apr 2024 22:59:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/apply/apply/MainForm.vue | 23 +++++++++++++++---- src/views/apply/apply/components/InfoForm.vue | 14 +++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue index febe124b8..fa7d4c7ca 100644 --- a/src/views/apply/apply/MainForm.vue +++ b/src/views/apply/apply/MainForm.vue @@ -48,7 +48,10 @@ - + + + @@ -277,14 +280,26 @@ const open = async (type: string, id?: number) => { formLoading.value = true try { formData.value = await MainApi.getMain(id) + if(formData.value.technicalField){ + formData.value.technicalField = Number(formData.value.technicalField) + } if(formData.value.beginDate){ formData.value.beginDate = Number(formData.value.beginDate) } - if(formData.value.engagMajor){ - formData.value.engagMajor =(formData.value.engagMajor).toString() + if(formData.value.endDate){ + formData.value.endDate = Number(formData.value.endDate) + } + if(formData.value.engagMajor){ + formData.value.engagMajor =Number(formData.value.engagMajor) } if(formData.value.major){ - formData.value.major =(formData.value.major).toString() + formData.value.major =Number(formData.value.major) + } + if(formData.value.gender){ + formData.value.gender =Number(formData.value.gender) + } + if(formData.value.education){ + formData.value.education =Number(formData.value.education) } } finally { formLoading.value = false diff --git a/src/views/apply/apply/components/InfoForm.vue b/src/views/apply/apply/components/InfoForm.vue index 998e70a8e..fef4ab700 100644 --- a/src/views/apply/apply/components/InfoForm.vue +++ b/src/views/apply/apply/components/InfoForm.vue @@ -28,15 +28,15 @@ 项目实施目标及考核指标 - + - + - + @@ -45,15 +45,15 @@ 主要研究内容开发内容 - + - + - + @@ -121,4 +121,4 @@ const getData = () => { } defineExpose({ validate, getData }) - \ No newline at end of file + From 85d2ce664bb9a763e301a21b17177158a47417d4 Mon Sep 17 00:00:00 2001 From: lizilong Date: Tue, 11 Jun 2024 22:52:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E5=85=B8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 3af1d830b..795660793 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -124,6 +124,7 @@ export enum DICT_TYPE { SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type', SYSTEM_SOCIAL_TYPE = 'system_social_type', SYSTEM_EDUCATION = "education", // 学历 + PLAN_ID="plan_id",//计划类型 SYSTEM_MAJOR = "major", //专业 // ========== 所属技术领域 ========== From 064a3645eccf19be01f589a047d2272eab82a68e Mon Sep 17 00:00:00 2001 From: liting <994745334@qq.com> Date: Tue, 11 Jun 2024 23:06:18 +0800 Subject: [PATCH 3/5] 123 --- src/api/contract/contract/index.ts | 265 +++++++------- src/views/contract/contract/MainForm.vue | 344 +++++++++--------- .../contract/components/FundsForm.vue | 4 +- .../contract/contract/components/InfoForm.vue | 2 +- src/views/contract/contract/index.vue | 203 +++++------ 5 files changed, 416 insertions(+), 402 deletions(-) diff --git a/src/api/contract/contract/index.ts b/src/api/contract/contract/index.ts index 928d2651c..768a2bd31 100644 --- a/src/api/contract/contract/index.ts +++ b/src/api/contract/contract/index.ts @@ -1,129 +1,136 @@ -import request from '@/config/axios' - -// 任务书主 VO -export interface MainVO { - id: number // 主键id - projectName: string // 项目名称 - projectLeader: string // 项目负责人 - projectLeaderId: number // 项目负责人Id - projectCode: string // 项目编号 - technicalField: string // 所属技术领域 - year: string // 年度 - beginDate: Date // 开始时间 - endDate: Date // 结束时间 - planName: string // 计划类型 - planId: string // 计划Id - supportingCondition: string // 课题实施所需的其他配套条件 - gender: number // 性别 - age: string // 年龄 - education: string // 学历 - major: string // 所学专业 - engagMajor: string // 从事专业 - position: string // 职务（职称） - phoneNo: string // 电话 - email: string // 邮箱 - fax: string // 传真 - postalCode: string // 邮编 - address: string // 通讯地址 - achievement: string // 主要业绩 - competentDeptId: number // 主管部门ID - competentDeptName: string // 主管部门 - managerId: number // 主管工程师ID - managerName: string // 主管工程师 - maintenanceUnitName: string // 维护单位名称 - maintenanceUnitId: number // 维护单位ID - undertakingUnitName: string // 承担单位名称 - undertakingUnitId: number // 承担单位ID - reviewUnitName: string // 审核单位名称 - reviewUnitId: number // 审核单位ID - state: string // 状态 -} - -// 任务书主 API -export const MainApi = { - // 查询任务书主分页 - getMainPage: async (params: any) => { - return await request.get({ url: `/contract/main/page`, params }) - }, - - // 查询任务书主详情 - getMain: async (id: number) => { - return await request.get({ url: `/contract/main/get?id=` + id }) - }, - - // 新增任务书主 - createMain: async (data: MainVO) => { - return await request.post({ url: `/contract/main/create`, data }) - }, - - // 修改任务书主 - updateMain: async (data: MainVO) => { - return await request.put({ url: `/contract/main/update`, data }) - }, - - // 删除任务书主 - deleteMain: async (id: number) => { - return await request.delete({ url: `/contract/main/delete?id=` + id }) - }, - - // 导出任务书主 Excel - exportMain: async (params) => { - return await request.download({ url: `/contract/main/export-excel`, params }) - }, - -// ==================== 子表（任务书详细信息） ==================== - - // 获得任务书详细信息 - getInfoByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（任务书项目目标） ==================== - - // 获得任务书项目目标列表 - getTargetListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/target/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（任务书考核指标） ==================== - - // 获得任务书考核指标列表 - getCheckListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/check/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（项目实施计划） ==================== - - // 获得项目实施计划列表 - getPlanListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（任务书经费） ==================== - - // 获得任务书经费列表 - getFundsListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（参加单位） ==================== - - // 获得参加单位列表 - getUnitListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/unit/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（项目所需设备） ==================== - - // 获得项目所需设备列表 - getDeviceListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/device/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（主要参加人员） ==================== - - // 获得主要参加人员列表 - getParticipantListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 任务书主 VO +export interface MainVO { + id: number // 主键id + projectName: string // 项目名称 + projectLeader: string // 项目负责人 + projectLeaderId: number // 项目负责人Id + projectCode: string // 项目编号 + technicalField: string // 所属技术领域 + year: string // 年度 + beginDate: Date // 开始时间 + endDate: Date // 结束时间 + planName: string // 计划类型 + planId: string // 计划Id + supportingCondition: string // 课题实施所需的其他配套条件 + gender: number // 性别 + age: string // 年龄 + education: string // 学历 + major: string // 所学专业 + engagMajor: string // 从事专业 + position: string // 职务（职称） + phoneNo: string // 电话 + email: string // 邮箱 + fax: string // 传真 + postalCode: string // 邮编 + address: string // 通讯地址 + achievement: string // 主要业绩 + competentDeptId: number // 主管部门ID + competentDeptName: string // 主管部门 + managerId: number // 主管工程师ID + managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: number // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: number // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: number // 审核单位ID + state: string // 状态 +} + +// 任务书主 API +export const MainApi = { + // 查询任务书主分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/contract/main/page`, params }) + }, + + // 查询任务书主详情 + getMain: async (id: number) => { + return await request.get({ url: `/contract/main/get?id=` + id }) + }, + + // 新增任务书主 + createMain: async (data: MainVO) => { + return await request.post({ url: `/contract/main/create`, data }) + }, + + // 修改任务书主 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/contract/main/update`, data }) + }, + + // 删除任务书主 + deleteMain: async (id: number) => { + return await request.delete({ url: `/contract/main/delete?id=` + id }) + }, + + // 导出任务书主 Excel + exportMain: async (params) => { + return await request.download({ url: `/contract/main/export-excel`, params }) + }, + // 导入立项 + getListPage: async (params) => { + return await request.get({ url: `/apply/main/page`, params }) + }, + + generateContract: async (data: MainVO) => { + return await request.post({ url: `/contract/main/generateContract`, data }) + }, +// ==================== 子表（任务书详细信息） ==================== + + // 获得任务书详细信息 + getInfoByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（任务书项目目标） ==================== + + // 获得任务书项目目标列表 + getTargetListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/target/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（任务书考核指标） ==================== + + // 获得任务书考核指标列表 + getCheckListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/check/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（项目实施计划） ==================== + + // 获得项目实施计划列表 + getPlanListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（任务书经费） ==================== + + // 获得任务书经费列表 + getFundsListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（参加单位） ==================== + + // 获得参加单位列表 + getUnitListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/unit/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（项目所需设备） ==================== + + // 获得项目所需设备列表 + getDeviceListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/device/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（主要参加人员） ==================== + + // 获得主要参加人员列表 + getParticipantListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId }) + }, +} diff --git a/src/views/contract/contract/MainForm.vue b/src/views/contract/contract/MainForm.vue index d21d69279..afa75990b 100644 --- a/src/views/contract/contract/MainForm.vue +++ b/src/views/contract/contract/MainForm.vue @@ -1,141 +1,151 @@ - + - +