From 94f4f639fdef1bd8f425ee7220d09dcb08388e5e Mon Sep 17 00:00:00 2001 From: liting <994745334@qq.com> Date: Tue, 16 Apr 2024 13:24:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/apply/apply/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/apply/apply/index.vue b/src/views/apply/apply/index.vue index 1f409bb40..c1ea6834f 100644 --- a/src/views/apply/apply/index.vue +++ b/src/views/apply/apply/index.vue @@ -108,7 +108,12 @@ - + + + 通过 + 不通过 + + - - - - - - - - - + + + + +
+

{{item.creatorName}}

+ {{item.status}} +
+

{{item.comment}}

+ + + + @@ -148,7 +152,7 @@ const Visible1 = ref(false) // 监听器 显示状态 const listenerFieldForm = ref({}) // 监听器 注入字段 详情表单 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 -const listRecord = ref([]) // 审核列表的数据 + const listRecord = ref([]) // 审核列表的数据 const total = ref(0) // 列表的总页数 const queryParams = reactive({ pageNo: 1, @@ -253,7 +257,7 @@ const saveListenerFiled = async () => { const aduitRecord = async (id?: number) => { try { const data = await MainApi.getRecordList(id) - Visible1.value = true + Visible1.value = true listRecord.value = data.list } finally { } @@ -263,4 +267,14 @@ const aduitRecord = async (id?: number) => { onMounted(() => { getList() }) - \ No newline at end of file + + \ No newline at end of file From 90095d2276e460dd1bfa1d9d0058d98881243a1d Mon Sep 17 00:00:00 2001 From: admin <546610682@qq.com> Date: Sat, 20 Apr 2024 16:23:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/acceptance/acceptance/index.ts | 137 +++++------ src/api/change/acceptance/acceptance/index.ts | 70 ++++++ src/api/change/change/index.ts | 103 +++++---- src/api/contract/contract/index.ts | 214 +++++++++--------- src/api/patents/patents/index.ts | 118 +++++----- src/api/process/process/index.ts | 123 +++++----- src/api/publicLab/publicLab/index.ts | 98 ++++---- src/layout/components/Footer/src/Footer.vue | 2 +- src/views/Login/Login.vue | 2 +- src/views/Login/SocialLogin.vue | 2 +- src/views/acceptance/acceptance/MainForm.vue | 93 ++++---- .../acceptance/components/FundsForm.vue | 14 +- .../acceptance/components/FundsList.vue | 120 ---------- .../acceptance/components/InfoList.vue | 119 ---------- src/views/acceptance/acceptance/index.vue | 51 +---- src/views/change/change/MainForm.vue | 61 ++--- src/views/change/change/index.vue | 59 ++++- src/views/contract/contract/MainForm.vue | 90 ++++++-- .../contract/components/FundsForm.vue | 56 +---- .../contract/contract/components/InfoForm.vue | 12 +- .../contract/components/ParticipantForm.vue | 75 ++---- .../contract/contract/components/PlanForm.vue | 56 +---- .../contract/components/UnitsForm.vue | 52 +---- src/views/contract/contract/index.vue | 84 ++++++- src/views/patents/patents/MainForm.vue | 10 +- src/views/patents/patents/index.vue | 55 ++--- src/views/process/process/MainForm.vue | 50 ++-- .../process/process/components/FundsForm.vue | 153 +++++++++++++ .../process/process/components/InfoForm.vue | 28 +-- src/views/process/process/index.vue | 24 +- src/views/publicLab/publicLab/index.vue | 12 +- src/views/system/user/index.vue | 4 +- 32 files changed, 1061 insertions(+), 1086 deletions(-) create mode 100644 src/api/change/acceptance/acceptance/index.ts delete mode 100644 src/views/acceptance/acceptance/components/FundsList.vue delete mode 100644 src/views/acceptance/acceptance/components/InfoList.vue create mode 100644 src/views/process/process/components/FundsForm.vue diff --git a/src/api/acceptance/acceptance/index.ts b/src/api/acceptance/acceptance/index.ts index f6f97758c..a905b0be0 100644 --- a/src/api/acceptance/acceptance/index.ts +++ b/src/api/acceptance/acceptance/index.ts @@ -1,67 +1,70 @@ -import request from '@/config/axios' - -// 验收主 VO -export interface MainVO { - id: string // id - contractId: string // 合同主键ID - code: string // 课题编号 - year: string // 年度 - name: string // 课题名称 - beginDate: string // 开始时间 - endData: string // 结束时间 - competentDeptId: string // 主管部门ID - competentDeptName: string // 主管部门 - managerId: string // 主管工程师ID - managerName: string // 主管工程师 - createdBy: string // 创建人 - createdTime: Date // 创建时间 - updatedBy: string // 更新人 - updatedTime: Date // 更新时间 -} - -// 验收主 API -export const MainApi = { - // 查询验收主分页 - getMainPage: async (params: any) => { - return await request.get({ url: `/acceptance/main/page`, params }) - }, - - // 查询验收主详情 - getMain: async (id: number) => { - return await request.get({ url: `/acceptance/main/get?id=` + id }) - }, - - // 新增验收主 - createMain: async (data: MainVO) => { - return await request.post({ url: `/acceptance/main/create`, data }) - }, - - // 修改验收主 - updateMain: async (data: MainVO) => { - return await request.put({ url: `/acceptance/main/update`, data }) - }, - - // 删除验收主 - deleteMain: async (id: number) => { - return await request.delete({ url: `/acceptance/main/delete?id=` + id }) - }, - - // 导出验收主 Excel - exportMain: async (params) => { - return await request.download({ url: `/acceptance/main/export-excel`, params }) - }, - -// ==================== 子表（验收详细信息） ==================== - - // 获得验收详细信息 - getInfoByAcceptanceId: async (acceptanceId) => { - return await request.get({ url: `/acceptance/main/info/get-by-acceptance-id?acceptanceId=` + acceptanceId }) - }, - -// ==================== 子表（验收经费） ==================== - - // 获得验收经费列表 - getFundsListByAcceptanceId: async (acceptanceId) => { - return await request.get({ url: `/acceptance/main/funds/list-by-acceptance-id?acceptanceId=` + acceptanceId }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 验收主 VO +export interface MainVO { + id: number // id + contractId: string // 合同主键ID + code: string // 课题编号 + year: string // 年度 + name: string // 课题名称 + beginDate: string // 开始时间 + endDate: string // 结束时间 + competentDeptId: string // 主管部门ID + competentDeptName: string // 主管部门 + managerId: string // 主管工程师ID + managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: string // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: string // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: string // 审核单位ID + state: string // 状态 +} + +// 验收主 API +export const MainApi = { + // 查询验收主分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/acceptance/main/page`, params }) + }, + + // 查询验收主详情 + getMain: async (id: number) => { + return await request.get({ url: `/acceptance/main/get?id=` + id }) + }, + + // 新增验收主 + createMain: async (data: MainVO) => { + return await request.post({ url: `/acceptance/main/create`, data }) + }, + + // 修改验收主 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/acceptance/main/update`, data }) + }, + + // 删除验收主 + deleteMain: async (id: number) => { + return await request.delete({ url: `/acceptance/main/delete?id=` + id }) + }, + + // 导出验收主 Excel + exportMain: async (params) => { + return await request.download({ url: `/acceptance/main/export-excel`, params }) + }, + +// ==================== 子表（验收经费） ==================== + + // 获得验收经费列表 + getFundsListByAcceptanceId: async (acceptanceId) => { + return await request.get({ url: `/acceptance/main/funds/list-by-acceptance-id?acceptanceId=` + acceptanceId }) + }, + +// ==================== 子表（验收详细信息） ==================== + + // 获得验收详细信息 + getInfoByAcceptanceId: async (acceptanceId) => { + return await request.get({ url: `/acceptance/main/info/get-by-acceptance-id?acceptanceId=` + acceptanceId }) + }, +} diff --git a/src/api/change/acceptance/acceptance/index.ts b/src/api/change/acceptance/acceptance/index.ts new file mode 100644 index 000000000..a905b0be0 --- /dev/null +++ b/src/api/change/acceptance/acceptance/index.ts @@ -0,0 +1,70 @@ +import request from '@/config/axios' + +// 验收主 VO +export interface MainVO { + id: number // id + contractId: string // 合同主键ID + code: string // 课题编号 + year: string // 年度 + name: string // 课题名称 + beginDate: string // 开始时间 + endDate: string // 结束时间 + competentDeptId: string // 主管部门ID + competentDeptName: string // 主管部门 + managerId: string // 主管工程师ID + managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: string // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: string // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: string // 审核单位ID + state: string // 状态 +} + +// 验收主 API +export const MainApi = { + // 查询验收主分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/acceptance/main/page`, params }) + }, + + // 查询验收主详情 + getMain: async (id: number) => { + return await request.get({ url: `/acceptance/main/get?id=` + id }) + }, + + // 新增验收主 + createMain: async (data: MainVO) => { + return await request.post({ url: `/acceptance/main/create`, data }) + }, + + // 修改验收主 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/acceptance/main/update`, data }) + }, + + // 删除验收主 + deleteMain: async (id: number) => { + return await request.delete({ url: `/acceptance/main/delete?id=` + id }) + }, + + // 导出验收主 Excel + exportMain: async (params) => { + return await request.download({ url: `/acceptance/main/export-excel`, params }) + }, + +// ==================== 子表（验收经费） ==================== + + // 获得验收经费列表 + getFundsListByAcceptanceId: async (acceptanceId) => { + return await request.get({ url: `/acceptance/main/funds/list-by-acceptance-id?acceptanceId=` + acceptanceId }) + }, + +// ==================== 子表（验收详细信息） ==================== + + // 获得验收详细信息 + getInfoByAcceptanceId: async (acceptanceId) => { + return await request.get({ url: `/acceptance/main/info/get-by-acceptance-id?acceptanceId=` + acceptanceId }) + }, +} diff --git a/src/api/change/change/index.ts b/src/api/change/change/index.ts index 9e358549d..bbc11bb45 100644 --- a/src/api/change/change/index.ts +++ b/src/api/change/change/index.ts @@ -1,50 +1,53 @@ -import request from '@/config/axios' - -// 变更主 VO -export interface MainVO { - id: string // id - contractId: string // 合同ID - changeType: string // 变更类型 - changeContent: string // 变更内容 - competentDeptId: string // 主管部门ID - competentDeptName: string // 主管部门 - managerId: string // 主管工程师ID - managerName: string // 主管工程师 - createdBy: string // 创建人 - createdTime: Date // 创建时间 - updatedBy: string // 更新人 - updatedTime: Date // 更新时间 -} - -// 变更主 API -export const MainApi = { - // 查询变更主分页 - getMainPage: async (params: any) => { - return await request.get({ url: `/change/main/page`, params }) - }, - - // 查询变更主详情 - getMain: async (id: number) => { - return await request.get({ url: `/change/main/get?id=` + id }) - }, - - // 新增变更主 - createMain: async (data: MainVO) => { - return await request.post({ url: `/change/main/create`, data }) - }, - - // 修改变更主 - updateMain: async (data: MainVO) => { - return await request.put({ url: `/change/main/update`, data }) - }, - - // 删除变更主 - deleteMain: async (id: number) => { - return await request.delete({ url: `/change/main/delete?id=` + id }) - }, - - // 导出变更主 Excel - exportMain: async (params) => { - return await request.download({ url: `/change/main/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 变更主 VO +export interface MainVO { + id: number // id + contractId: number // 合同ID + changeType: string // 变更类型 + changeContent: string // 变更内容 + competentDeptId: string // 主管部门ID + competentDeptName: string // 主管部门 + managerId: string // 主管工程师ID + managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: string // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: string // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: string // 审核单位ID + state: string // 状态 +} + +// 变更主 API +export const MainApi = { + // 查询变更主分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/change/main/page`, params }) + }, + + // 查询变更主详情 + getMain: async (id: number) => { + return await request.get({ url: `/change/main/get?id=` + id }) + }, + + // 新增变更主 + createMain: async (data: MainVO) => { + return await request.post({ url: `/change/main/create`, data }) + }, + + // 修改变更主 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/change/main/update`, data }) + }, + + // 删除变更主 + deleteMain: async (id: number) => { + return await request.delete({ url: `/change/main/delete?id=` + id }) + }, + + // 导出变更主 Excel + exportMain: async (params) => { + return await request.download({ url: `/change/main/export-excel`, params }) + }, +} diff --git a/src/api/contract/contract/index.ts b/src/api/contract/contract/index.ts index 3a68d0a23..d131f1380 100644 --- a/src/api/contract/contract/index.ts +++ b/src/api/contract/contract/index.ts @@ -1,107 +1,107 @@ -import request from '@/config/axios' - -// 合同（任务书）信息主 VO -export interface MainVO { - id: string // id - code: string // 合同编号 - name: string // 任务名称 - technicalField: string // 所属技术领域 - planId: string // 计划类型Id - planName: string // 计划类型名称 - year: string // 年度 - beginDate: string // 开始时间 - endData: string // 结束时间 - directorId: string // 负责人Id - director: string // 负责人姓名 - gender: string // 负责人性别 - age: string // 年龄 - education: string // 学历 - major: string // 所学专业 - engagMajor: string // 从事专业 - position: string // 职务（职称） - phoneNo: string // 电话 - email: string // 邮箱 - fax: string // 传真 - postalCode: string // 邮编 - address: string // 通讯地址 - achievement: string // 主要业绩 - competentDeptId: string // 主管部门ID - competentDeptName: string // 主管部门 - managerId: string // 主管工程师ID - managerName: 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 }) - }, - -// ==================== 子表（合同预期主要成果形式、知识产权归属） ==================== - - // 获得合同预期主要成果形式、知识产权归属列表 - getAchieListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/achie/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（合同经费） ==================== - - // 获得合同经费列表 - getFundsListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（合同详细信息） ==================== - - // 获得合同详细信息 - getInfoByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（合同主要参加人员） ==================== - - // 获得合同主要参加人员列表 - getParticipantListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（合同实施计划） ==================== - - // 获得合同实施计划列表 - getPlanListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId }) - }, - -// ==================== 子表（合同单位信息） ==================== - - // 获得合同单位信息列表 - getUnitsListByContractId: async (contractId) => { - return await request.get({ url: `/contract/main/units/list-by-contract-id?contractId=` + contractId }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 合同（任务书）信息主 VO +export interface MainVO { + id: number // id + code: string // 合同编号 + name: string // 任务名称 + technicalField: string // 所属技术领域 + planId: string // 计划类型Id + planName: string // 计划类型名称 + year: string // 年度 + beginDate: string // 开始时间 + endDate: string // 结束时间 + directorId: string // 负责人Id + director: string // 负责人姓名 + gender: string // 负责人性别 + age: string // 年龄 + education: string // 学历 + major: string // 所学专业 + engagMajor: string // 从事专业 + position: string // 职务（职称） + phoneNo: string // 电话 + email: string // 邮箱 + fax: string // 传真 + postalCode: string // 邮编 + address: string // 通讯地址 + achievement: string // 主要业绩 + competentDeptId: string // 主管部门ID + competentDeptName: string // 主管部门 + managerId: string // 主管工程师ID + managerName: string // 主管工程师 + maintenanceUnitName: string // 维护单位名称 + maintenanceUnitId: string // 维护单位ID + undertakingUnitName: string // 承担单位名称 + undertakingUnitId: string // 承担单位ID + reviewUnitName: string // 审核单位名称 + reviewUnitId: string // 审核单位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 }) + }, + +// ==================== 子表（合同经费） ==================== + + // 获得合同经费列表 + getFundsListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/funds/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（合同详细信息） ==================== + + // 获得合同详细信息 + getInfoByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/info/get-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（合同主要参加人员） ==================== + + // 获得合同主要参加人员列表 + getParticipantListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/participant/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（合同实施计划） ==================== + + // 获得合同实施计划列表 + getPlanListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/plan/list-by-contract-id?contractId=` + contractId }) + }, + +// ==================== 子表（合同单位信息） ==================== + + // 获得合同单位信息列表 + getUnitsListByContractId: async (contractId) => { + return await request.get({ url: `/contract/main/units/list-by-contract-id?contractId=` + contractId }) + }, +} diff --git a/src/api/patents/patents/index.ts b/src/api/patents/patents/index.ts index 6a13c8f66..3b40d851c 100644 --- a/src/api/patents/patents/index.ts +++ b/src/api/patents/patents/index.ts @@ -1,59 +1,59 @@ -import request from '@/config/axios' - -// 专利信息 VO -export interface MainVO { - id: string // id - contractId: string // 合同id - contractCode: string // 合同编号 - name: string // 专利名称 - number: string // 专利号 - inventorName: string // 发明人姓名 - filingDate: string // 申请日期 - publicationDate: string // 公开日期 - grantDate: string // 授权日期 - patentType: string // 专利类型（如发明、实用新型、外观设计等） - patenteeName: string // 专利权人姓名或公司名称 - relatedTechArea: string // 相关技术领域 - technicalEffect: string // 技术效果 - legalStatus: string // 法律状态（如审查中、已授权、无效等） -} - -// 专利信息 API -export const MainApi = { - // 查询专利信息分页 - getMainPage: async (params: any) => { - return await request.get({ url: `/patents/main/page`, params }) - }, - - // 查询专利信息详情 - getMain: async (id: number) => { - return await request.get({ url: `/patents/main/get?id=` + id }) - }, - - // 新增专利信息 - createMain: async (data: MainVO) => { - return await request.post({ url: `/patents/main/create`, data }) - }, - - // 修改专利信息 - updateMain: async (data: MainVO) => { - return await request.put({ url: `/patents/main/update`, data }) - }, - - // 删除专利信息 - deleteMain: async (id: number) => { - return await request.delete({ url: `/patents/main/delete?id=` + id }) - }, - - // 导出专利信息 Excel - exportMain: async (params) => { - return await request.download({ url: `/patents/main/export-excel`, params }) - }, - -// ==================== 子表（专利信息） ==================== - - // 获得专利信息列表 - getInfoListByPatentsId: async (patentsId) => { - return await request.get({ url: `/patents/main/info/list-by-patents-id?patentsId=` + patentsId }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 专利信息 VO +export interface MainVO { + id: number // id + contractId: number // 合同id + contractCode: string // 合同编号 + name: string // 专利名称 + number: string // 专利号 + inventorName: string // 发明人姓名 + filingDate: string // 申请日期 + publicationDate: string // 公开日期 + grantDate: string // 授权日期 + patentType: string // 专利类型（如发明、实用新型、外观设计等） + patenteeName: string // 专利权人姓名或公司名称 + relatedTechArea: string // 相关技术领域 + technicalEffect: string // 技术效果 + legalStatus: string // 法律状态（如审查中、已授权、无效等） +} + +// 专利信息 API +export const MainApi = { + // 查询专利信息分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/patents/main/page`, params }) + }, + + // 查询专利信息详情 + getMain: async (id: number) => { + return await request.get({ url: `/patents/main/get?id=` + id }) + }, + + // 新增专利信息 + createMain: async (data: MainVO) => { + return await request.post({ url: `/patents/main/create`, data }) + }, + + // 修改专利信息 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/patents/main/update`, data }) + }, + + // 删除专利信息 + deleteMain: async (id: number) => { + return await request.delete({ url: `/patents/main/delete?id=` + id }) + }, + + // 导出专利信息 Excel + exportMain: async (params) => { + return await request.download({ url: `/patents/main/export-excel`, params }) + }, + +// ==================== 子表（专利信息） ==================== + + // 获得专利信息列表 + getInfoListByPatentsId: async (patentsId) => { + return await request.get({ url: `/patents/main/info/list-by-patents-id?patentsId=` + patentsId }) + }, +} diff --git a/src/api/process/process/index.ts b/src/api/process/process/index.ts index 80a96884f..08ead29dc 100644 --- a/src/api/process/process/index.ts +++ b/src/api/process/process/index.ts @@ -1,60 +1,63 @@ -import request from '@/config/axios' - -// 执行主 VO -export interface MainVO { - id: string // id - contractId: string // 合同主键Id - contractCode: string // 合同编号 - section: string // 执行区段 - progress: string // 进展情况（正常，拖延，停顿） - directorId: string // 负责人Id - director: string // 负责人姓名 - competentDeptId: string // 主管部门ID - competentDeptName: string // 主管部门 - managerId: string // 主管工程师ID - managerName: string // 主管工程师 - createdBy: string // 创建人 - createdTime: Date // 创建时间 - updatedBy: string // 更新人 - updatedTime: Date // 更新时间 -} - -// 执行主 API -export const MainApi = { - // 查询执行主分页 - getMainPage: async (params: any) => { - return await request.get({ url: `/process/main/page`, params }) - }, - - // 查询执行主详情 - getMain: async (id: number) => { - return await request.get({ url: `/process/main/get?id=` + id }) - }, - - // 新增执行主 - createMain: async (data: MainVO) => { - return await request.post({ url: `/process/main/create`, data }) - }, - - // 修改执行主 - updateMain: async (data: MainVO) => { - return await request.put({ url: `/process/main/update`, data }) - }, - - // 删除执行主 - deleteMain: async (id: number) => { - return await request.delete({ url: `/process/main/delete?id=` + id }) - }, - - // 导出执行主 Excel - exportMain: async (params) => { - return await request.download({ url: `/process/main/export-excel`, params }) - }, - -// ==================== 子表（执行详细信息） ==================== - - // 获得执行详细信息 - getInfoByProcessId: async (processId) => { - return await request.get({ url: `/process/main/info/get-by-process-id?processId=` + processId }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 执行主 VO +export interface MainVO { + id: number // id + contractId: number // 合同主键Id + contractCode: string // 合同编号 + section: string // 执行区段 + progress: string // 进展情况（正常，拖延，停顿） + directorId: string // 负责人Id + director: string // 负责人姓名 + competentDeptId: string // 主管部门ID + competentDeptName: string // 主管部门 + managerId: string // 主管工程师ID + managerName: string // 主管工程师 +} + +// 执行主 API +export const MainApi = { + // 查询执行主分页 + getMainPage: async (params: any) => { + return await request.get({ url: `/process/main/page`, params }) + }, + + // 查询执行主详情 + getMain: async (id: number) => { + return await request.get({ url: `/process/main/get?id=` + id }) + }, + + // 新增执行主 + createMain: async (data: MainVO) => { + return await request.post({ url: `/process/main/create`, data }) + }, + + // 修改执行主 + updateMain: async (data: MainVO) => { + return await request.put({ url: `/process/main/update`, data }) + }, + + // 删除执行主 + deleteMain: async (id: number) => { + return await request.delete({ url: `/process/main/delete?id=` + id }) + }, + + // 导出执行主 Excel + exportMain: async (params) => { + return await request.download({ url: `/process/main/export-excel`, params }) + }, + +// ==================== 子表（执行经费情况） ==================== + + // 获得执行经费情况列表 + getFundsListByProcessId: async (processId) => { + return await request.get({ url: `/process/main/funds/list-by-process-id?processId=` + processId }) + }, + +// ==================== 子表（执行详细信息） ==================== + + // 获得执行详细信息 + getInfoByProcessId: async (processId) => { + return await request.get({ url: `/process/main/info/get-by-process-id?processId=` + processId }) + }, +} diff --git a/src/api/publicLab/publicLab/index.ts b/src/api/publicLab/publicLab/index.ts index 33543c489..e119fa1b1 100644 --- a/src/api/publicLab/publicLab/index.ts +++ b/src/api/publicLab/publicLab/index.ts @@ -1,49 +1,49 @@ -import request from '@/config/axios' - -// 公共实验室信 VO -export interface LabInfoVO { - id: string // id - userName: string // 用户姓名 - userContact: string // 用户联系方式 - reservationDate: string // 预约日期 - labName: string // 实验室名称 - reservationDuration: string // 预约时长（小时） - status: string // 预约状态（如待审核、已确认、已拒绝等） - reviewerId: string // 审核人ID - reviewerName: string // 审核人姓名 - reviewComments: string // 审核意见（如有） - reservationNotes: string // 预约备注（如有） -} - -// 公共实验室信 API -export const LabInfoApi = { - // 查询公共实验室信分页 - getLabInfoPage: async (params: any) => { - return await request.get({ url: `/publicLab/lab-info/page`, params }) - }, - - // 查询公共实验室信详情 - getLabInfo: async (id: number) => { - return await request.get({ url: `/publicLab/lab-info/get?id=` + id }) - }, - - // 新增公共实验室信 - createLabInfo: async (data: LabInfoVO) => { - return await request.post({ url: `/publicLab/lab-info/create`, data }) - }, - - // 修改公共实验室信 - updateLabInfo: async (data: LabInfoVO) => { - return await request.put({ url: `/publicLab/lab-info/update`, data }) - }, - - // 删除公共实验室信 - deleteLabInfo: async (id: number) => { - return await request.delete({ url: `/publicLab/lab-info/delete?id=` + id }) - }, - - // 导出公共实验室信 Excel - exportLabInfo: async (params) => { - return await request.download({ url: `/publicLab/lab-info/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 公共实验室信 VO +export interface LabInfoVO { + id: number // id + userName: string // 用户姓名 + userContact: string // 用户联系方式 + reservationDate: string // 预约日期 + labName: string // 实验室名称 + reservationDuration: string // 预约时长（小时） + status: string // 预约状态（如待审核、已确认、已拒绝等） + reviewerId: string // 审核人ID + reviewerName: string // 审核人姓名 + reviewComments: string // 审核意见（如有） + reservationNotes: string // 预约备注（如有） +} + +// 公共实验室信 API +export const LabInfoApi = { + // 查询公共实验室信分页 + getLabInfoPage: async (params: any) => { + return await request.get({ url: `/publicLab/lab-info/page`, params }) + }, + + // 查询公共实验室信详情 + getLabInfo: async (id: number) => { + return await request.get({ url: `/publicLab/lab-info/get?id=` + id }) + }, + + // 新增公共实验室信 + createLabInfo: async (data: LabInfoVO) => { + return await request.post({ url: `/publicLab/lab-info/create`, data }) + }, + + // 修改公共实验室信 + updateLabInfo: async (data: LabInfoVO) => { + return await request.put({ url: `/publicLab/lab-info/update`, data }) + }, + + // 删除公共实验室信 + deleteLabInfo: async (id: number) => { + return await request.delete({ url: `/publicLab/lab-info/delete?id=` + id }) + }, + + // 导出公共实验室信 Excel + exportLabInfo: async (params) => { + return await request.download({ url: `/publicLab/lab-info/export-excel`, params }) + }, +} diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue index 3eede3865..55101592b 100644 --- a/src/layout/components/Footer/src/Footer.vue +++ b/src/layout/components/Footer/src/Footer.vue @@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle) :class="prefixCls" class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]" > - Copyright ©2022-{{ title }} + Copyright ©2024-{{ title }} diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 2ac76875b..7e795431a 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -44,7 +44,7 @@
diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index 1eb9293c0..c57946c79 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -196,7 +196,7 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', + tenantName: '金隅集团', username: 'admin', password: 'admin123', captchaVerification: '', diff --git a/src/views/acceptance/acceptance/MainForm.vue b/src/views/acceptance/acceptance/MainForm.vue index 0ebd2b470..4633c29fe 100644 --- a/src/views/acceptance/acceptance/MainForm.vue +++ b/src/views/acceptance/acceptance/MainForm.vue @@ -27,9 +27,9 @@ placeholder="选择开始时间" /> - + - - + + - - + + - - + + - - + + + + + + + + + + + - - - + + + \ No newline at end of file + diff --git a/src/views/acceptance/acceptance/components/FundsForm.vue b/src/views/acceptance/acceptance/components/FundsForm.vue index 5c75e87ae..4a8e15d51 100644 --- a/src/views/acceptance/acceptance/components/FundsForm.vue +++ b/src/views/acceptance/acceptance/components/FundsForm.vue @@ -23,10 +23,10 @@ - + @@ -51,6 +51,13 @@ + + + - + - - - - - - - - - - - - - - - @@ -123,11 +78,6 @@ const handleAdd = () => { contractId: undefined, implDate: undefined, implContent: undefined, - revision: undefined, - createdBy: undefined, - createdTime: undefined, - updatedBy: undefined, - updatedTime: undefined, } row.contractId = props.contractId formData.value.push(row) @@ -149,4 +99,4 @@ const getData = () => { } defineExpose({ validate, getData }) - \ No newline at end of file + diff --git a/src/views/contract/contract/components/UnitsForm.vue b/src/views/contract/contract/components/UnitsForm.vue index bc04ca7a6..bb301725d 100644 --- a/src/views/contract/contract/components/UnitsForm.vue +++ b/src/views/contract/contract/components/UnitsForm.vue @@ -100,51 +100,6 @@ - - - - - - - - - - - - - - - + \ No newline at end of file + diff --git a/src/views/process/process/MainForm.vue b/src/views/process/process/MainForm.vue index 18ffc20b5..f939f3957 100644 --- a/src/views/process/process/MainForm.vue +++ b/src/views/process/process/MainForm.vue @@ -17,7 +17,9 @@ - + + + @@ -37,31 +39,12 @@ - - - - - - - - - - - - + + + @@ -74,6 +57,7 @@ \ No newline at end of file + diff --git a/src/views/process/process/components/FundsForm.vue b/src/views/process/process/components/FundsForm.vue new file mode 100644 index 000000000..c918e2631 --- /dev/null +++ b/src/views/process/process/components/FundsForm.vue @@ -0,0 +1,153 @@ + + diff --git a/src/views/process/process/components/InfoForm.vue b/src/views/process/process/components/InfoForm.vue index e1d343036..801358853 100644 --- a/src/views/process/process/components/InfoForm.vue +++ b/src/views/process/process/components/InfoForm.vue @@ -15,28 +15,6 @@ - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/views/process/process/index.vue b/src/views/process/process/index.vue index ca8c388f9..796421d62 100644 --- a/src/views/process/process/index.vue +++ b/src/views/process/process/index.vue @@ -8,6 +8,15 @@ :inline="true" label-width="68px" > + + + + + + + + - @@ -139,8 +157,10 @@ const total = ref(0) // 列表的总页数 const queryParams = reactive({ pageNo: 1, pageSize: 10, + contractId: undefined, contractCode: undefined, section: undefined, + progress: undefined, director: undefined, competentDeptName: undefined, managerName: undefined, @@ -210,4 +230,4 @@ const handleExport = async () => { onMounted(() => { getList() }) - \ No newline at end of file + diff --git a/src/views/publicLab/publicLab/index.vue b/src/views/publicLab/publicLab/index.vue index fb0c247b4..a5b4cda0b 100644 --- a/src/views/publicLab/publicLab/index.vue +++ b/src/views/publicLab/publicLab/index.vue @@ -37,6 +37,15 @@ class="!w-240px" /> + + + { onMounted(() => { getList() }) - \ No newline at end of file + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4f04dff54..06f8a3a76 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,7 +1,7 @@