mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-07-25 00:15:06 +08:00
[fix] 更新各个合同模块的字段
This commit is contained in:
wyw
@ -4,15 +4,22 @@ import request from '@/config/axios'
|
||||
export interface OutsContractVO {
|
||||
id: number // 主键
|
||||
projectId: number // 项目id
|
||||
name: string // 合同名称
|
||||
contractId: number // 主合同id
|
||||
countType: string // 类型
|
||||
amount: number // 合同金额
|
||||
code: string // 编号
|
||||
major: string // 专业
|
||||
signingTime: Date // 签订时间
|
||||
settlementAmount: number // 结算数
|
||||
contractFileUrl: string // 合同文件url
|
||||
creator: string // 创建者
|
||||
createTime: Date // 创建时间
|
||||
updater: string // 更新者
|
||||
updateTime: Date // 更新时间
|
||||
deleted: boolean // 是否删除
|
||||
tenantId: number // 租户编号
|
||||
outsCompany: string // 外包单位
|
||||
amount: number // 外包合同金额
|
||||
code: number // 外包合同编号
|
||||
finalAmount: number // 最终外包金额
|
||||
finalEditor: string // 最后编辑人
|
||||
}
|
||||
|
||||
// 外包合同 API
|
||||
@ -10,9 +10,6 @@
|
||||
<el-form-item label="项目id" prop="projectId">
|
||||
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="主合同id" prop="contractId">
|
||||
<el-input v-model="formData.contractId" placeholder="请输入主合同id" />
|
||||
</el-form-item>
|
||||
@ -26,12 +23,6 @@
|
||||
/>
|
||||
</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="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="专业" prop="major">
|
||||
<el-select v-model="formData.major" placeholder="请选择专业">
|
||||
<el-option
|
||||
@ -50,12 +41,54 @@
|
||||
placeholder="选择签订时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="结算数" prop="settlementAmount">
|
||||
<el-input v-model="formData.settlementAmount" placeholder="请输入结算数" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同文件url" prop="contractFileUrl">
|
||||
<UploadFile v-model="formData.contractFileUrl" />
|
||||
</el-form-item>
|
||||
<el-form-item label="创建者" prop="creator">
|
||||
<el-input v-model="formData.creator" placeholder="请输入创建者" />
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="formData.createTime"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择创建时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="更新者" prop="updater">
|
||||
<el-input v-model="formData.updater" placeholder="请输入更新者" />
|
||||
</el-form-item>
|
||||
<el-form-item label="更新时间" prop="updateTime">
|
||||
<el-date-picker
|
||||
v-model="formData.updateTime"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择更新时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否删除" prop="deleted">
|
||||
<el-radio-group v-model="formData.deleted">
|
||||
<el-radio label="1">请选择字典生成</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="租户编号" prop="tenantId">
|
||||
<el-input v-model="formData.tenantId" placeholder="请输入租户编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="外包单位" prop="outsCompany">
|
||||
<el-input v-model="formData.outsCompany" 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="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入外包合同编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最终外包金额" prop="finalAmount">
|
||||
<el-input v-model="formData.finalAmount" placeholder="请输入最终外包金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最后编辑人" prop="finalEditor">
|
||||
<el-input v-model="formData.finalEditor" placeholder="请输入最后编辑人" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
@ -80,18 +113,29 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
contractId: undefined,
|
||||
countType: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
major: undefined,
|
||||
signingTime: undefined,
|
||||
settlementAmount: undefined,
|
||||
contractFileUrl: undefined,
|
||||
creator: undefined,
|
||||
createTime: undefined,
|
||||
updater: undefined,
|
||||
updateTime: undefined,
|
||||
deleted: undefined,
|
||||
tenantId: undefined,
|
||||
outsCompany: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
finalAmount: undefined,
|
||||
finalEditor: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
||||
createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
|
||||
updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
|
||||
deleted: [{ required: true, message: '是否删除不能为空', trigger: 'blur' }],
|
||||
tenantId: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
@ -142,15 +186,22 @@ const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
contractId: undefined,
|
||||
countType: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
major: undefined,
|
||||
signingTime: undefined,
|
||||
settlementAmount: undefined,
|
||||
contractFileUrl: undefined,
|
||||
creator: undefined,
|
||||
createTime: undefined,
|
||||
updater: undefined,
|
||||
updateTime: undefined,
|
||||
deleted: undefined,
|
||||
tenantId: undefined,
|
||||
outsCompany: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
finalAmount: undefined,
|
||||
finalEditor: undefined,
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
@ -17,15 +17,6 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入合同名称"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="主合同id" prop="contractId">
|
||||
<el-input
|
||||
v-model="queryParams.contractId"
|
||||
@ -50,24 +41,6 @@
|
||||
/>
|
||||
</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="code">
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="专业" prop="major">
|
||||
<el-select
|
||||
v-model="queryParams.major"
|
||||
@ -94,15 +67,6 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="结算数" prop="settlementAmount">
|
||||
<el-input
|
||||
v-model="queryParams.settlementAmount"
|
||||
placeholder="请输入结算数"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime"
|
||||
@ -114,6 +78,51 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="外包单位" prop="outsCompany">
|
||||
<el-input
|
||||
v-model="queryParams.outsCompany"
|
||||
placeholder="请输入外包单位"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
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="code">
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入外包合同编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="最终外包金额" prop="finalAmount">
|
||||
<el-input
|
||||
v-model="queryParams.finalAmount"
|
||||
placeholder="请输入最终外包金额"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
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>
|
||||
<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>
|
||||
@ -143,15 +152,12 @@
|
||||
<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="合同名称" align="center" prop="name" />
|
||||
<el-table-column label="主合同id" align="center" prop="contractId" />
|
||||
<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="amount" />
|
||||
<el-table-column label="编号" align="center" prop="code" />
|
||||
<el-table-column label="专业" align="center" prop="major">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.MAJOR" :value="scope.row.major" />
|
||||
@ -164,8 +170,8 @@
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="结算数" align="center" prop="settlementAmount" />
|
||||
<el-table-column label="合同文件url" align="center" prop="contractFileUrl" />
|
||||
<el-table-column label="创建者" align="center" prop="creator" />
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
align="center"
|
||||
@ -173,6 +179,21 @@
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="更新者" align="center" prop="updater" />
|
||||
<el-table-column
|
||||
label="更新时间"
|
||||
align="center"
|
||||
prop="updateTime"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="是否删除" align="center" prop="deleted" />
|
||||
<el-table-column label="租户编号" align="center" prop="tenantId" />
|
||||
<el-table-column label="外包单位" align="center" prop="outsCompany" />
|
||||
<el-table-column label="外包合同金额" align="center" prop="amount" />
|
||||
<el-table-column label="外包合同编号" align="center" prop="code" />
|
||||
<el-table-column label="最终外包金额" align="center" prop="finalAmount" />
|
||||
<el-table-column label="最后编辑人" align="center" prop="finalEditor" />
|
||||
<el-table-column label="操作" align="center">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
@ -227,16 +248,17 @@ const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
contractId: undefined,
|
||||
countType: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
major: undefined,
|
||||
signingTime: [],
|
||||
settlementAmount: undefined,
|
||||
contractFileUrl: undefined,
|
||||
createTime: [],
|
||||
outsCompany: undefined,
|
||||
amount: undefined,
|
||||
code: undefined,
|
||||
finalAmount: undefined,
|
||||
finalEditor: undefined,
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
@ -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 })
|
||||
},
|
||||
|
||||
@ -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()
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,69 +1,73 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
// 外部合同 VO
|
||||
// 外部合同管理 VO
|
||||
export interface ExtContractVO {
|
||||
id: number // 主键
|
||||
contractId: number // 合同id
|
||||
projectId: number // 项目id
|
||||
name: string // 合同名称
|
||||
type: string // 合同类型
|
||||
customerCompanyId: number // 客户公司id
|
||||
progress: string // 合同进展
|
||||
expectedTime: Date // 预计签订时间
|
||||
signingTime: Date // 签订时间
|
||||
archiveTime: Date // 归档时间
|
||||
status: string // 状态
|
||||
amount: number // 合同金额
|
||||
amount: number // 合同总金额
|
||||
preAmount: number // 前期费用
|
||||
designFee: number // 设计费
|
||||
surveyFees: number // 勘测费
|
||||
testingFee: number // 检测费
|
||||
otherFee: string // 其他费
|
||||
otherFee: number // 其他费
|
||||
countType: string // 计费方式
|
||||
remark: string // 备注
|
||||
contractFileUrl: string // 合同附件url
|
||||
constructionCost: number // 建安费
|
||||
source: string // 资金来源
|
||||
chargingStandard: string // 收费标准
|
||||
discount: string // 优惠
|
||||
discount: number // 优惠
|
||||
consortium: boolean // 是否联合体
|
||||
consortiumCompany: string // 联合体单位
|
||||
reminderTime: Date // 合同提示时间
|
||||
reminderTime: Date // 合同商议提示
|
||||
approvedAmount: number // 审定金额
|
||||
reviewFileUrl: string // 审核文件url
|
||||
finalEditor: string // 最后编辑人
|
||||
creator: string // 创建者
|
||||
createTime: Date // 创建时间
|
||||
updater: string // 更新者
|
||||
updateTime: Date // 更新时间
|
||||
contractId: number // 合同id
|
||||
deleted: boolean // 是否删除
|
||||
tenantId: number // 租户编号
|
||||
}
|
||||
|
||||
// 外部合同 API
|
||||
// 外部合同管理 API
|
||||
export const ExtContractApi = {
|
||||
// 查询外部合同分页
|
||||
// 查询外部合同管理分页
|
||||
getExtContractPage: async (params: any) => {
|
||||
return await request.get({ url: `/cms-ext/ext-contract/page`, params })
|
||||
return await request.get({ url: `/cms/ext-contract/page`, params })
|
||||
},
|
||||
|
||||
// 查询外部合同详情
|
||||
// 查询外部合同管理详情
|
||||
getExtContract: async (id: number) => {
|
||||
return await request.get({ url: `/cms-ext/ext-contract/get?id=` + id })
|
||||
return await request.get({ url: `/cms/ext-contract/get?id=` + id })
|
||||
},
|
||||
|
||||
// 新增外部合同
|
||||
// 新增外部合同管理
|
||||
createExtContract: async (data: ExtContractVO) => {
|
||||
return await request.post({ url: `/cms-ext/ext-contract/create`, data })
|
||||
return await request.post({ url: `/cms/ext-contract/create`, data })
|
||||
},
|
||||
|
||||
// 修改外部合同
|
||||
// 修改外部合同管理
|
||||
updateExtContract: async (data: ExtContractVO) => {
|
||||
return await request.put({ url: `/cms-ext/ext-contract/update`, data })
|
||||
return await request.put({ url: `/cms/ext-contract/update`, data })
|
||||
},
|
||||
|
||||
// 删除外部合同
|
||||
// 删除外部合同管理
|
||||
deleteExtContract: async (id: number) => {
|
||||
return await request.delete({ url: `/cms-ext/ext-contract/delete?id=` + id })
|
||||
return await request.delete({ url: `/cms/ext-contract/delete?id=` + id })
|
||||
},
|
||||
|
||||
// 导出外部合同 Excel
|
||||
// 导出外部合同管理 Excel
|
||||
exportExtContract: async (params) => {
|
||||
return await request.download({ url: `/cms-ext/ext-contract/export-excel`, params })
|
||||
return await request.download({ url: `/cms/ext-contract/export-excel`, params })
|
||||
},
|
||||
}
|
||||
@ -7,17 +7,25 @@
|
||||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="合同id" prop="contractId">
|
||||
<el-input v-model="formData.contractId" placeholder="请输入合同id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="项目id" prop="projectId">
|
||||
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同名称" prop="name">
|
||||
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同类型" prop="type">
|
||||
<el-select v-model="formData.type" placeholder="请选择合同类型">
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
<el-option
|
||||
v-for="dict in getStrDictOptions(DICT_TYPE.CONTRACT_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户公司id" prop="customerCompanyId">
|
||||
<el-input v-model="formData.customerCompanyId" placeholder="请输入客户公司id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同进展" prop="progress">
|
||||
<el-input v-model="formData.progress" placeholder="请输入合同进展" />
|
||||
</el-form-item>
|
||||
@ -55,8 +63,8 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同金额" prop="amount">
|
||||
<el-input v-model="formData.amount" placeholder="请输入合同金额" />
|
||||
<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="请输入前期费用" />
|
||||
@ -123,12 +131,12 @@
|
||||
<el-form-item label="联合体单位" prop="consortiumCompany">
|
||||
<el-input v-model="formData.consortiumCompany" placeholder="请输入联合体单位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同提示时间" prop="reminderTime">
|
||||
<el-form-item label="合同商议提示" prop="reminderTime">
|
||||
<el-date-picker
|
||||
v-model="formData.reminderTime"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择合同提示时间"
|
||||
placeholder="选择合同商议提示"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="审定金额" prop="approvedAmount">
|
||||
@ -137,6 +145,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>
|
||||
@ -159,8 +170,13 @@
|
||||
placeholder="选择更新时间"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同id" prop="contractId">
|
||||
<el-input v-model="formData.contractId" placeholder="请输入合同id" />
|
||||
<el-form-item label="是否删除" prop="deleted">
|
||||
<el-radio-group v-model="formData.deleted">
|
||||
<el-radio label="1">请选择字典生成</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="租户编号" prop="tenantId">
|
||||
<el-input v-model="formData.tenantId" placeholder="请输入租户编号" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@ -171,9 +187,9 @@
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { ExtContractApi, ExtContractVO } from '@/api/cms-ext/extcontract'
|
||||
import { ExtContractApi, ExtContractVO } from '@/api/cms/extcontract'
|
||||
|
||||
/** 外部合同 表单 */
|
||||
/** 外部合同管理 表单 */
|
||||
defineOptions({ name: 'ExtContractForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
@ -184,9 +200,11 @@ const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
contractId: undefined,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
type: undefined,
|
||||
customerCompanyId: undefined,
|
||||
progress: undefined,
|
||||
expectedTime: undefined,
|
||||
signingTime: undefined,
|
||||
@ -210,19 +228,25 @@ const formData = ref({
|
||||
reminderTime: undefined,
|
||||
approvedAmount: undefined,
|
||||
reviewFileUrl: undefined,
|
||||
finalEditor: undefined,
|
||||
creator: undefined,
|
||||
createTime: undefined,
|
||||
updater: undefined,
|
||||
updateTime: undefined,
|
||||
contractId: undefined,
|
||||
deleted: undefined,
|
||||
tenantId: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
||||
expectedTime: [{ required: true, message: '预计签订时间不能为空', trigger: 'blur' }],
|
||||
amount: [{ required: true, message: '合同总金额不能为空', trigger: 'blur' }],
|
||||
countType: [{ required: true, message: '计费方式不能为空', trigger: 'change' }],
|
||||
chargingStandard: [{ required: true, message: '收费标准不能为空', trigger: 'change' }],
|
||||
consortium: [{ required: true, message: '是否联合体不能为空', trigger: 'blur' }],
|
||||
createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
|
||||
updateTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
|
||||
deleted: [{ required: true, message: '是否删除不能为空', trigger: 'blur' }],
|
||||
tenantId: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
@ -271,9 +295,11 @@ const submitForm = async () => {
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
contractId: undefined,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
type: undefined,
|
||||
customerCompanyId: undefined,
|
||||
progress: undefined,
|
||||
expectedTime: undefined,
|
||||
signingTime: undefined,
|
||||
@ -297,11 +323,13 @@ const resetForm = () => {
|
||||
reminderTime: undefined,
|
||||
approvedAmount: undefined,
|
||||
reviewFileUrl: undefined,
|
||||
finalEditor: undefined,
|
||||
creator: undefined,
|
||||
createTime: undefined,
|
||||
updater: undefined,
|
||||
updateTime: undefined,
|
||||
contractId: undefined,
|
||||
deleted: undefined,
|
||||
tenantId: undefined,
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
@ -8,6 +8,24 @@
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="合同id" prop="contractId">
|
||||
<el-input
|
||||
v-model="queryParams.contractId"
|
||||
placeholder="请输入合同id"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<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="合同名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
@ -24,18 +42,14 @@
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
<el-option
|
||||
v-for="dict in getStrDictOptions(DICT_TYPE.CONTRACT_TYPE)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户公司id" prop="customerCompanyId">
|
||||
<el-input
|
||||
v-model="queryParams.customerCompanyId"
|
||||
placeholder="请输入客户公司id"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同进展" prop="progress">
|
||||
<el-input
|
||||
v-model="queryParams.progress"
|
||||
@ -93,10 +107,10 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同金额" prop="amount">
|
||||
<el-form-item label="合同总金额" prop="amount">
|
||||
<el-input
|
||||
v-model="queryParams.amount"
|
||||
placeholder="请输入合同金额"
|
||||
placeholder="请输入合同总金额"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
@ -238,7 +252,7 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同提示时间" prop="reminderTime">
|
||||
<el-form-item label="合同商议提示" prop="reminderTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.reminderTime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
@ -258,6 +272,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"
|
||||
@ -298,10 +321,20 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同id" prop="contractId">
|
||||
<el-form-item label="是否删除" prop="deleted">
|
||||
<el-select
|
||||
v-model="queryParams.deleted"
|
||||
placeholder="请选择是否删除"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="租户编号" prop="tenantId">
|
||||
<el-input
|
||||
v-model="queryParams.contractId"
|
||||
placeholder="请输入合同id"
|
||||
v-model="queryParams.tenantId"
|
||||
placeholder="请输入租户编号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
@ -314,7 +347,7 @@
|
||||
type="primary"
|
||||
plain
|
||||
@click="openForm('create')"
|
||||
v-hasPermi="['cms-ext:ext-contract:create']"
|
||||
v-hasPermi="['cms:ext-contract:create']"
|
||||
>
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
@ -323,7 +356,7 @@
|
||||
plain
|
||||
@click="handleExport"
|
||||
:loading="exportLoading"
|
||||
v-hasPermi="['cms-ext:ext-contract:export']"
|
||||
v-hasPermi="['cms:ext-contract:export']"
|
||||
>
|
||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||
</el-button>
|
||||
@ -334,9 +367,15 @@
|
||||
<!-- 列表 -->
|
||||
<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="contractId" />
|
||||
<el-table-column label="项目id" align="center" prop="projectId" />
|
||||
<el-table-column label="合同名称" align="center" prop="name" />
|
||||
<el-table-column label="合同类型" align="center" prop="type" />
|
||||
<el-table-column label="客户公司id" align="center" prop="customerCompanyId" />
|
||||
<el-table-column label="合同类型" align="center" prop="type">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.CONTRACT_TYPE" :value="scope.row.type" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同进展" align="center" prop="progress" />
|
||||
<el-table-column
|
||||
label="预计签订时间"
|
||||
@ -364,7 +403,7 @@
|
||||
<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="amount" />
|
||||
<el-table-column label="前期费用" align="center" prop="preAmount" />
|
||||
<el-table-column label="设计费" align="center" prop="designFee" />
|
||||
<el-table-column label="勘测费" align="center" prop="surveyFees" />
|
||||
@ -392,7 +431,7 @@
|
||||
<el-table-column label="是否联合体" align="center" prop="consortium" />
|
||||
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
|
||||
<el-table-column
|
||||
label="合同提示时间"
|
||||
label="合同商议提示"
|
||||
align="center"
|
||||
prop="reminderTime"
|
||||
:formatter="dateFormatter"
|
||||
@ -400,6 +439,7 @@
|
||||
/>
|
||||
<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="创建时间"
|
||||
@ -416,14 +456,15 @@
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="合同id" align="center" prop="contractId" />
|
||||
<el-table-column label="是否删除" align="center" prop="deleted" />
|
||||
<el-table-column label="租户编号" align="center" prop="tenantId" />
|
||||
<el-table-column label="操作" align="center">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['cms-ext:ext-contract:update']"
|
||||
v-hasPermi="['cms:ext-contract:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
@ -431,7 +472,7 @@
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['cms-ext:ext-contract:delete']"
|
||||
v-hasPermi="['cms:ext-contract:delete']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
@ -455,10 +496,10 @@
|
||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { ExtContractApi, ExtContractVO } from '@/api/cms-ext/extcontract'
|
||||
import { ExtContractApi, ExtContractVO } from '@/api/cms/extcontract'
|
||||
import ExtContractForm from './ExtContractForm.vue'
|
||||
|
||||
/** 外部合同 列表 */
|
||||
/** 外部合同管理 列表 */
|
||||
defineOptions({ name: 'ExtContract' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
@ -470,9 +511,10 @@ const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
contractId: undefined,
|
||||
projectId: undefined,
|
||||
name: undefined,
|
||||
type: undefined,
|
||||
customerCompanyId: undefined,
|
||||
progress: undefined,
|
||||
expectedTime: [],
|
||||
signingTime: [],
|
||||
@ -496,11 +538,13 @@ const queryParams = reactive({
|
||||
reminderTime: [],
|
||||
approvedAmount: undefined,
|
||||
reviewFileUrl: undefined,
|
||||
finalEditor: undefined,
|
||||
creator: undefined,
|
||||
createTime: [],
|
||||
updater: undefined,
|
||||
updateTime: [],
|
||||
contractId: undefined,
|
||||
deleted: undefined,
|
||||
tenantId: undefined,
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
@ -556,7 +600,7 @@ const handleExport = async () => {
|
||||
// 发起导出
|
||||
exportLoading.value = true
|
||||
const data = await ExtContractApi.exportExtContract(queryParams)
|
||||
download.excel(data, '外部合同.xls')
|
||||
download.excel(data, '外部合同管理.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
Reference in New Issue
Block a user