hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-18 04:55:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix] 更新各个合同模块的字段

Browse Source
This commit is contained in:
wyw
2024-08-12 13:22:33 +08:00
parent f2cfb723a9
commit 50a30ff83e
32 changed files with 941 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
yudao-ui/yudao-ui-admin-vue3-contract/src/api/cms/contract/index.ts
View File

@ -1,7 +1,10 @@
import request from '@/config/axios'
// 合同 VO
// 合同管理 VO
export interface ContractVO {
id: number // 主键
projectId: number // 项目id
extContractId: number // 外部合同id
name: string // 合同名称
type: string // 合同类型
progress: string // 合同进展
@ -10,59 +13,56 @@ export interface ContractVO {
signingTime: Date // 签订时间
archiveTime: Date // 归档时间
status: string // 合同状态
amount: number // 签订合同总额
countType: string // 计费方式
provisionalSettlement: number // 暂定结算数
remark: string // 备注
contractFileUrl: string // 合同url
constructionCost: number // 建安费
source: string // 资金来源
discount: string // 优惠
discount: number // 优惠
consortium: boolean // 是否联合体
consortiumCompany: string // 联合体单位
extProportion: string // 占主合同比例
extProportion: number // 占主合同比例
approvedAmount: number // 审定金额
reviewFileUrl: string // 审核文件url
finalEditor: string // 最后编辑人
creator: string // 创建者
createTime: Date // 创建时间
updater: string // 更新者
updateTime: Date // 更新时间
deleted: boolean // 是否删除
tenantId: number // 租户编号
amount: number // 签订合同总额
preAmount: number // 前期费
designAmount: number // 设计费
surveyFees: number // 勘测费
measurementFee: number // 测量费
otherFee: number // 其他费
}
// 合同 API
// 合同管理 API
export const ContractApi = {
// 查询合同分页
// 查询合同管理分页
getContractPage: async (params: any) => {
return await request.get({ url: `/cms/contract/page`, params })
},
// 查询合同详情
// 查询合同管理详情
getContract: async (id: number) => {
return await request.get({ url: `/cms/contract/get?id=` + id })
},
// 新增合同
// 新增合同管理
createContract: async (data: ContractVO) => {
return await request.post({ url: `/cms/contract/create`, data })
},
// 修改合同
// 修改合同管理
updateContract: async (data: ContractVO) => {
return await request.put({ url: `/cms/contract/update`, data })
},
// 删除合同
// 删除合同管理
deleteContract: async (id: number) => {
return await request.delete({ url: `/cms/contract/delete?id=` + id })
},
// 导出合同 Excel
// 导出合同管理 Excel
exportContract: async (params) => {
return await request.download({ url: `/cms/contract/export-excel`, params })
},

67
yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/ContractForm.vue
View File

@ -7,6 +7,12 @@
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="外部合同id" prop="extContractId">
<el-input v-model="formData.extContractId" placeholder="请输入外部合同id" />
</el-form-item>
<el-form-item label="合同名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入合同名称" />
</el-form-item>
@ -60,6 +66,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="签订合同总额" prop="amount">
<el-input v-model="formData.amount" placeholder="请输入签订合同总额" />
</el-form-item>
<el-form-item label="计费方式" prop="countType">
<el-select v-model="formData.countType" placeholder="请选择计费方式">
<el-option
@ -70,6 +79,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="暂定结算数" prop="provisionalSettlement">
<el-input v-model="formData.provisionalSettlement" placeholder="请输入暂定结算数" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
@ -81,12 +93,7 @@
</el-form-item>
<el-form-item label="资金来源" prop="source">
<el-select v-model="formData.source" placeholder="请选择资金来源">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.FUNDS_SOURCE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="优惠" prop="discount">
@ -109,6 +116,9 @@
<el-form-item label="审核文件url" prop="reviewFileUrl">
<UploadFile v-model="formData.reviewFileUrl" />
</el-form-item>
<el-form-item label="最后编辑人" prop="finalEditor">
<el-input v-model="formData.finalEditor" placeholder="请输入最后编辑人" />
</el-form-item>
<el-form-item label="创建者" prop="creator">
<el-input v-model="formData.creator" placeholder="请输入创建者" />
</el-form-item>
@ -139,24 +149,6 @@
<el-form-item label="租户编号" prop="tenantId">
<el-input v-model="formData.tenantId" placeholder="请输入租户编号" />
</el-form-item>
<el-form-item label="签订合同总额" prop="amount">
<el-input v-model="formData.amount" placeholder="请输入签订合同总额" />
</el-form-item>
<el-form-item label="前期费" prop="preAmount">
<el-input v-model="formData.preAmount" placeholder="请输入前期费" />
</el-form-item>
<el-form-item label="设计费" prop="designAmount">
<el-input v-model="formData.designAmount" placeholder="请输入设计费" />
</el-form-item>
<el-form-item label="勘测费" prop="surveyFees">
<el-input v-model="formData.surveyFees" placeholder="请输入勘测费" />
</el-form-item>
<el-form-item label="测量费" prop="measurementFee">
<el-input v-model="formData.measurementFee" placeholder="请输入测量费" />
</el-form-item>
<el-form-item label="其他费" prop="otherFee">
<el-input v-model="formData.otherFee" placeholder="请输入其他费" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -168,7 +160,7 @@
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { ContractApi, ContractVO } from '@/api/cms/contract'
/** 合同 表单 */
/** 合同管理 表单 */
defineOptions({ name: 'ContractForm' })
const { t } = useI18n() // 国际化
@ -179,6 +171,9 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
projectId: undefined,
extContractId: undefined,
name: undefined,
type: undefined,
progress: undefined,
@ -187,7 +182,9 @@ const formData = ref({
signingTime: undefined,
archiveTime: undefined,
status: undefined,
amount: undefined,
countType: undefined,
provisionalSettlement: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
@ -198,20 +195,16 @@ const formData = ref({
extProportion: undefined,
approvedAmount: undefined,
reviewFileUrl: undefined,
finalEditor: undefined,
creator: undefined,
createTime: undefined,
updater: undefined,
updateTime: undefined,
deleted: undefined,
tenantId: undefined,
amount: undefined,
preAmount: undefined,
designAmount: undefined,
surveyFees: undefined,
measurementFee: undefined,
otherFee: undefined,
})
const formRules = reactive({
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
type: [{ required: true, message: '合同类型不能为空', trigger: 'change' }],
progress: [{ required: true, message: '合同进展不能为空', trigger: 'blur' }],
@ -271,6 +264,9 @@ const submitForm = async () => {
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
projectId: undefined,
extContractId: undefined,
name: undefined,
type: undefined,
progress: undefined,
@ -279,7 +275,9 @@ const resetForm = () => {
signingTime: undefined,
archiveTime: undefined,
status: undefined,
amount: undefined,
countType: undefined,
provisionalSettlement: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
@ -290,18 +288,13 @@ const resetForm = () => {
extProportion: undefined,
approvedAmount: undefined,
reviewFileUrl: undefined,
finalEditor: undefined,
creator: undefined,
createTime: undefined,
updater: undefined,
updateTime: undefined,
deleted: undefined,
tenantId: undefined,
amount: undefined,
preAmount: undefined,
designAmount: undefined,
surveyFees: undefined,
measurementFee: undefined,
otherFee: undefined,
}
formRef.value?.resetFields()
}

139
yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue
View File

@ -8,6 +8,24 @@
:inline="true"
label-width="68px"
>
<el-form-item label="项目id" prop="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入项目id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="外部合同id" prop="extContractId">
<el-input
v-model="queryParams.extContractId"
placeholder="请输入外部合同id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="合同名称" prop="name">
<el-input
v-model="queryParams.name"
@ -95,6 +113,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="签订合同总额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入签订合同总额"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="计费方式" prop="countType">
<el-select
v-model="queryParams.countType"
@ -110,6 +137,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="暂定结算数" prop="provisionalSettlement">
<el-input
v-model="queryParams.provisionalSettlement"
placeholder="请输入暂定结算数"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
@ -135,12 +171,7 @@
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.FUNDS_SOURCE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="优惠" prop="discount">
@ -189,6 +220,15 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="最后编辑人" prop="finalEditor">
<el-input
v-model="queryParams.finalEditor"
placeholder="请输入最后编辑人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建者" prop="creator">
<el-input
v-model="queryParams.creator"
@ -248,60 +288,6 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="签订合同总额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入签订合同总额"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="前期费" prop="preAmount">
<el-input
v-model="queryParams.preAmount"
placeholder="请输入前期费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设计费" prop="designAmount">
<el-input
v-model="queryParams.designAmount"
placeholder="请输入设计费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="勘测费" prop="surveyFees">
<el-input
v-model="queryParams.surveyFees"
placeholder="请输入勘测费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="测量费" prop="measurementFee">
<el-input
v-model="queryParams.measurementFee"
placeholder="请输入测量费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="其他费" prop="otherFee">
<el-input
v-model="queryParams.otherFee"
placeholder="请输入其他费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -329,6 +315,9 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="项目id" align="center" prop="projectId" />
<el-table-column label="外部合同id" align="center" prop="extContractId" />
<el-table-column label="合同名称" align="center" prop="name" />
<el-table-column label="合同类型" align="center" prop="type" />
<el-table-column label="合同进展" align="center" prop="progress" />
@ -365,25 +354,24 @@
<dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="签订合同总额" align="center" prop="amount" />
<el-table-column label="计费方式" align="center" prop="countType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CONTRACT_BILLING_TYPE" :value="scope.row.countType" />
</template>
</el-table-column>
<el-table-column label="暂定结算数" align="center" prop="provisionalSettlement" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="合同url" align="center" prop="contractFileUrl" />
<el-table-column label="建安费" align="center" prop="constructionCost" />
<el-table-column label="资金来源" align="center" prop="source">
<template #default="scope">
<dict-tag :type="DICT_TYPE.FUNDS_SOURCE" :value="scope.row.source" />
</template>
</el-table-column>
<el-table-column label="资金来源" align="center" prop="source" />
<el-table-column label="优惠" align="center" prop="discount" />
<el-table-column label="是否联合体" align="center" prop="consortium" />
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
<el-table-column label="占主合同比例" align="center" prop="extProportion" />
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
<el-table-column label="审核文件url" align="center" prop="reviewFileUrl" />
<el-table-column label="最后编辑人" align="center" prop="finalEditor" />
<el-table-column label="创建者" align="center" prop="creator" />
<el-table-column
label="创建时间"
@ -402,12 +390,6 @@
/>
<el-table-column label="是否删除" align="center" prop="deleted" />
<el-table-column label="租户编号" align="center" prop="tenantId" />
<el-table-column label="签订合同总额" align="center" prop="amount" />
<el-table-column label="前期费" align="center" prop="preAmount" />
<el-table-column label="设计费" align="center" prop="designAmount" />
<el-table-column label="勘测费" align="center" prop="surveyFees" />
<el-table-column label="测量费" align="center" prop="measurementFee" />
<el-table-column label="其他费" align="center" prop="otherFee" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
@ -449,7 +431,7 @@ import download from '@/utils/download'
import { ContractApi, ContractVO } from '@/api/cms/contract'
import ContractForm from './ContractForm.vue'
/** 合同 列表 */
/** 合同管理 列表 */
defineOptions({ name: 'Contract' })
const message = useMessage() // 消息弹窗
@ -461,6 +443,8 @@ const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
projectId: undefined,
extContractId: undefined,
name: undefined,
type: undefined,
progress: undefined,
@ -469,7 +453,9 @@ const queryParams = reactive({
signingTime: [],
archiveTime: [],
status: undefined,
amount: undefined,
countType: undefined,
provisionalSettlement: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
@ -480,18 +466,13 @@ const queryParams = reactive({
extProportion: undefined,
approvedAmount: undefined,
reviewFileUrl: undefined,
finalEditor: undefined,
creator: undefined,
createTime: [],
updater: undefined,
updateTime: [],
deleted: undefined,
tenantId: undefined,
amount: undefined,
preAmount: undefined,
designAmount: undefined,
surveyFees: undefined,
measurementFee: undefined,
otherFee: undefined,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
@ -547,7 +528,7 @@ const handleExport = async () => {
// 发起导出
exportLoading.value = true
const data = await ContractApi.exportContract(queryParams)
download.excel(data, '合同.xls')
download.excel(data, '合同管理.xls')
} catch {
} finally {
exportLoading.value = false