From 34ff167879b7d0e5e9d65203cd6f77382eb96377 Mon Sep 17 00:00:00 2001 From: SADYX Date: Thu, 25 Jul 2024 17:16:46 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cms/extcontract/index.ts | 136 +++++++++--------- src/views/cms/contract/ContractForm.vue | 30 +++- src/views/cms/contract/index.vue | 47 ++++-- src/views/cms/extcontract/ExtContractForm.vue | 82 ++++++++--- src/views/cms/extcontract/index.vue | 130 +++++++++++++---- 5 files changed, 295 insertions(+), 130 deletions(-) diff --git a/src/api/cms/extcontract/index.ts b/src/api/cms/extcontract/index.ts index 440cc673..adf69cac 100644 --- a/src/api/cms/extcontract/index.ts +++ b/src/api/cms/extcontract/index.ts @@ -1,67 +1,69 @@ -import request from '@/config/axios' - -// 外部合同 VO -export interface ExtContractVO { - id: number // 主键 - projectId: number // 项目id - name: string // 合同名称 - type: string // 合同类型 - customerCompanyId: number // 客户公司id - progress: string // 合同进展 - expectedTime: Date // 预计签订时间 - signingTime: Date // 签订时间 - archiveTime: Date // 归档时间 - status: string // 状态 - amount: number // 合同金额 - preAmount: number // 前期费用 - designFee: number // 设计费 - surveyFees: number // 勘测费 - testingFee: number // 检测费 - otherFee: string // 其他费 - countType: string // 计费方式 - remark: string // 备注 - contractFileUrl: string // 合同附件url - constructionCost: number // 建安费 - source: string // 资金来源 - chargingStandard: string // 收费标准 - discount: string // 优惠 - consortium: boolean // 是否联合体 - consortiumCompany: string // 联合体单位 - reminderTime: Date // 合同提示时间 - approvedAmount: number // 审定金额 - reviewFileUrl: string // 审核文件url - contractId: number // 合同id -} - -// 外部合同 API -export const ExtContractApi = { - // 查询外部合同分页 - getExtContractPage: async (params: any) => { - return await request.get({ url: `/cms-ext/ext-contract/page`, params }) - }, - - // 查询外部合同详情 - getExtContract: async (id: number) => { - return await request.get({ url: `/cms-ext/ext-contract/get?id=` + id }) - }, - - // 新增外部合同 - createExtContract: async (data: ExtContractVO) => { - return await request.post({ url: `/cms-ext/ext-contract/create`, data }) - }, - - // 修改外部合同 - updateExtContract: async (data: ExtContractVO) => { - return await request.put({ url: `/cms-ext/ext-contract/update`, data }) - }, - - // 删除外部合同 - deleteExtContract: async (id: number) => { - return await request.delete({ url: `/cms-ext/ext-contract/delete?id=` + id }) - }, - - // 导出外部合同 Excel - exportExtContract: async (params) => { - return await request.download({ url: `/cms-ext/ext-contract/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 外部合同 VO +export interface ExtContractVO { + name: string // 合同名称 + type: string // 合同类型 + customerCompanyId: number // 客户公司id + progress: string // 合同进展 + expectedTime: Date // 预计签订时间 + signingTime: Date // 签订时间 + archiveTime: Date // 归档时间 + status: string // 状态 + amount: number // 合同金额 + preAmount: number // 前期费用 + designFee: number // 设计费 + surveyFees: number // 勘测费 + testingFee: number // 检测费 + otherFee: string // 其他费 + countType: string // 计费方式 + remark: string // 备注 + contractFileUrl: string // 合同附件url + constructionCost: number // 建安费 + source: string // 资金来源 + chargingStandard: string // 收费标准 + discount: string // 优惠 + consortium: boolean // 是否联合体 + consortiumCompany: string // 联合体单位 + reminderTime: Date // 合同提示时间 + approvedAmount: number // 审定金额 + reviewFileUrl: string // 审核文件url + creator: string // 创建者 + createTime: Date // 创建时间 + updater: string // 更新者 + updateTime: Date // 更新时间 + contractId: number // 合同id +} + +// 外部合同 API +export const ExtContractApi = { + // 查询外部合同分页 + getExtContractPage: async (params: any) => { + return await request.get({ url: `/cms/ext-contract/page`, params }) + }, + + // 查询外部合同详情 + getExtContract: async (id: number) => { + return await request.get({ url: `/cms/ext-contract/get?id=` + id }) + }, + + // 新增外部合同 + createExtContract: async (data: ExtContractVO) => { + return await request.post({ url: `/cms/ext-contract/create`, data }) + }, + + // 修改外部合同 + updateExtContract: async (data: ExtContractVO) => { + return await request.put({ url: `/cms/ext-contract/update`, data }) + }, + + // 删除外部合同 + deleteExtContract: async (id: number) => { + return await request.delete({ url: `/cms/ext-contract/delete?id=` + id }) + }, + + // 导出外部合同 Excel + exportExtContract: async (params) => { + return await request.download({ url: `/cms/ext-contract/export-excel`, params }) + }, +} diff --git a/src/views/cms/contract/ContractForm.vue b/src/views/cms/contract/ContractForm.vue index ad947705..667de6db 100644 --- a/src/views/cms/contract/ContractForm.vue +++ b/src/views/cms/contract/ContractForm.vue @@ -51,13 +51,23 @@ /> - - 请选择字典生成 - + + + - + @@ -70,7 +80,14 @@ - + + + @@ -148,6 +165,7 @@