hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-08 14:44:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feat] 新增外包合同历史管理

Browse Source
This commit is contained in:
wyw 2024-08-02 13:22:33 +08:00
parent e0c60dd15b
commit 2e9937cad2
11 changed files with 1090 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sql/cms/codegen-cms-exthistory-sql.sql Normal file
View File

@ -0,0 +1,55 @@
-- 菜单 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status, component_name
)
VALUES (
'外部合同管理', '', 2, 0, 2758,
'ext-contract-history', '', 'cms/extcontracthistory/index', 0, 'ExtContractHistory'
);
-- 按钮父菜单ID
-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
SELECT @parentId := LAST_INSERT_ID();
-- 按钮 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'外部合同查询', 'cms:ext-contract-history:query', 3, 1, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'外部合同创建', 'cms:ext-contract-history:create', 3, 2, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'外部合同更新', 'cms:ext-contract-history:update', 3, 3, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'外部合同删除', 'cms:ext-contract-history:delete', 3, 4, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'外部合同导出', 'cms:ext-contract-history:export', 3, 5, @parentId,
'', '', '', 0
);

27
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/OutsContractHistoryController.java
View File

@ -9,7 +9,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import cn.iocoder.yudao.module.cms.service.outscontracthistory.OutsContractHistoryService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,13 +35,6 @@ public class OutsContractHistoryController {
@Resource
private OutsContractHistoryService outsContractHistoryService;
@PostMapping("/create")
@Operation(summary = "创建外包合同历史")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:create')")
public CommonResult<Long> createOutsContractHistory(@Valid @RequestBody OutsContractHistorySaveReqVO createReqVO) {
return success(outsContractHistoryService.createOutsContractHistory(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新外包合同历史")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:update')")
@ -51,30 +43,21 @@ public class OutsContractHistoryController {
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除外包合同历史")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:delete')")
public CommonResult<Boolean> deleteOutsContractHistory(@RequestParam("id") Long id) {
outsContractHistoryService.deleteOutsContractHistory(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得外包合同历史")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
public CommonResult<OutsContractHistoryRespVO> getOutsContractHistory(@RequestParam("id") Long id) {
OutsContractHistoryDO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id);
return success(BeanUtils.toBean(outsContractHistory, OutsContractHistoryRespVO.class));
OutsContractHistoryRespVO outsContractHistory = outsContractHistoryService.getOutsContractHistory(id);
return success(outsContractHistory);
}
@GetMapping("/page")
@Operation(summary = "获得外包合同历史分页")
@PreAuthorize("@ss.hasPermission('cms:outs-contract-history:query')")
public CommonResult<PageResult<OutsContractHistoryRespVO>> getOutsContractHistoryPage(@Valid OutsContractHistoryPageReqVO pageReqVO) {
PageResult<OutsContractHistoryDO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, OutsContractHistoryRespVO.class));
PageResult<OutsContractHistoryRespVO> pageResult = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
@ -84,7 +67,7 @@ public class OutsContractHistoryController {
public void exportOutsContractHistoryExcel(@Valid OutsContractHistoryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<OutsContractHistoryDO> list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList();
List<OutsContractHistoryRespVO> list = outsContractHistoryService.getOutsContractHistoryPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "外包合同历史.xls", "数据", OutsContractHistoryRespVO.class,
BeanUtils.toBean(list, OutsContractHistoryRespVO.class));

23
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryPageReqVO.java
View File

@ -30,32 +30,9 @@ public class OutsContractHistoryPageReqVO extends PageParam {
@Schema(description = "类型", example = "1")
private String countType;
@Schema(description = "合同金额")
private BigDecimal amount;
@Schema(description = "编号")
private String code;
@Schema(description = "专业")
private String major;
@Schema(description = "流程实体id", example = "32397")
private String processInstanceId;
@Schema(description = "签订时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] signingTime;
@Schema(description = "结算数")
private BigDecimal settlementAmount;
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
private String contractFileUrl;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "流程状态", example = "2")
private String processStatus;

27
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistoryRespVO.java
View File

@ -15,18 +15,23 @@ import java.time.LocalDateTime;
@ExcelIgnoreUnannotated
public class OutsContractHistoryRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16040")
@ExcelProperty("主键")
private Long id;
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31803")
@ExcelProperty("项目id")
private Long projectId;
@Schema(description = "合同名称", example = "芋艿")
@Schema(description = "合同名称", example = "张三")
@ExcelProperty("合同名称")
private String name;
@Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部")
@ExcelProperty("主控部门")
private String trackingDep;
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("项目经理")
private String projectManager;
@Schema(description = "签订合同总额")
@ExcelProperty("签订合同总额")
private BigDecimal outsAmount;
@Schema(description = "主合同id", example = "19949")
@ExcelProperty("主合同id")
private Long contractId;
@ -65,10 +70,6 @@ public class OutsContractHistoryRespVO {
@ExcelProperty("合同文件url")
private String contractFileUrl;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "流程状态", example = "2")
@ExcelProperty("流程状态")
private String processStatus;

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/outscontracthistory/vo/OutsContractHistorySaveReqVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -18,9 +19,25 @@ public class OutsContractHistorySaveReqVO {
@NotNull(message = "项目id不能为空")
private Long projectId;
@Schema(description = "合同名称", example = "芋艿")
@Schema(description = "合同名称", example = "张三")
@ExcelProperty("合同名称")
private String name;
@Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产一部")
@ExcelProperty("主控部门")
private String trackingDep;
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("项目经理")
private String projectManager;
@Schema(description = "签订合同总额")
@ExcelProperty("签订合同总额")
private BigDecimal outsAmount;
@Schema(description = "主合同id", example = "19949")
private Long contractId;

10
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontracthistory/OutsContractHistoryMapper.java
View File

@ -21,18 +21,10 @@ public interface OutsContractHistoryMapper extends BaseMapperX<OutsContractHisto
.likeIfPresent(OutsContractHistoryDO::getName, reqVO.getName())
.eqIfPresent(OutsContractHistoryDO::getContractId, reqVO.getContractId())
.eqIfPresent(OutsContractHistoryDO::getCountType, reqVO.getCountType())
.eqIfPresent(OutsContractHistoryDO::getAmount, reqVO.getAmount())
.eqIfPresent(OutsContractHistoryDO::getCode, reqVO.getCode())
.eqIfPresent(OutsContractHistoryDO::getMajor, reqVO.getMajor())
.eqIfPresent(OutsContractHistoryDO::getProcessInstanceId, reqVO.getProcessInstanceId())
.betweenIfPresent(OutsContractHistoryDO::getSigningTime, reqVO.getSigningTime())
.eqIfPresent(OutsContractHistoryDO::getSettlementAmount, reqVO.getSettlementAmount())
.eqIfPresent(OutsContractHistoryDO::getContractFileUrl, reqVO.getContractFileUrl())
.betweenIfPresent(OutsContractHistoryDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(OutsContractHistoryDO::getProcessStatus, reqVO.getProcessStatus())
.eqIfPresent(OutsContractHistoryDO::getOutsContractId, reqVO.getOutsContractId())
.eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion())
.orderByDesc(OutsContractHistoryDO::getId));
.eqIfPresent(OutsContractHistoryDO::getVersion, reqVO.getVersion()));
}
}

19
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryService.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.service.outscontracthistory;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import jakarta.validation.Valid;
@ -13,14 +14,6 @@ import jakarta.validation.Valid;
*/
public interface OutsContractHistoryService {
/**
* 创建外包合同历史
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createOutsContractHistory(@Valid OutsContractHistorySaveReqVO createReqVO);
/**
* 更新外包合同历史
*
@ -28,12 +21,6 @@ public interface OutsContractHistoryService {
*/
void updateOutsContractHistory(@Valid OutsContractHistorySaveReqVO updateReqVO);
/**
* 删除外包合同历史
*
* @param id 编号
*/
void deleteOutsContractHistory(Long id);
/**
* 获得外包合同历史
@ -41,7 +28,7 @@ public interface OutsContractHistoryService {
* @param id 编号
* @return 外包合同历史
*/
OutsContractHistoryDO getOutsContractHistory(Long id);
OutsContractHistoryRespVO getOutsContractHistory(Long id);
/**
* 获得外包合同历史分页
@ -49,6 +36,6 @@ public interface OutsContractHistoryService {
* @param pageReqVO 分页查询
* @return 外包合同历史分页
*/
PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
PageResult<OutsContractHistoryRespVO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO);
}

77
yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java
View File

@ -2,16 +2,25 @@ package cn.iocoder.yudao.module.cms.service.outscontracthistory;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryPageReqVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistoryRespVO;
import cn.iocoder.yudao.module.cms.controller.admin.outscontracthistory.vo.OutsContractHistorySaveReqVO;
import cn.iocoder.yudao.module.cms.dal.dataobject.outscontracthistory.OutsContractHistoryDO;
import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper;
import cn.iocoder.yudao.module.cms.service.contract.ContractService;
import cn.iocoder.yudao.module.pms.api.ProjectApi;
import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.OUTS_CONTRACT_HISTORY_NOT_EXISTS;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS;
/**
* 外包合同历史 Service 实现类
@ -25,14 +34,11 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
@Resource
private OutsContractHistoryMapper outsContractHistoryMapper;
@Override
public Long createOutsContractHistory(OutsContractHistorySaveReqVO createReqVO) {
// 插入
OutsContractHistoryDO outsContractHistory = BeanUtils.toBean(createReqVO, OutsContractHistoryDO.class);
outsContractHistoryMapper.insert(outsContractHistory);
// 返回
return outsContractHistory.getId();
}
@Resource
private ProjectApi projectApi;
@Resource
private ContractService contractService;
@Override
public void updateOutsContractHistory(OutsContractHistorySaveReqVO updateReqVO) {
@ -43,14 +49,6 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
outsContractHistoryMapper.updateById(updateObj);
}
@Override
public void deleteOutsContractHistory(Long id) {
// 校验存在
validateOutsContractHistoryExists(id);
// 删除
outsContractHistoryMapper.deleteById(id);
}
private void validateOutsContractHistoryExists(Long id) {
if (outsContractHistoryMapper.selectById(id) == null) {
throw exception(OUTS_CONTRACT_HISTORY_NOT_EXISTS);
@ -58,13 +56,50 @@ public class OutsContractHistoryServiceImpl implements OutsContractHistoryServic
}
@Override
public OutsContractHistoryDO getOutsContractHistory(Long id) {
return outsContractHistoryMapper.selectById(id);
public OutsContractHistoryRespVO getOutsContractHistory(Long id) {
//校验
if (id == null) {
throw exception(OUTS_CONTRACT_NOT_EXISTS);
}
OutsContractHistoryDO outsContractHistoryDO = outsContractHistoryMapper.selectById(id);
OutsContractHistoryRespVO outsContractHistoryResp = BeanUtils.toBean(outsContractHistoryDO, OutsContractHistoryRespVO.class);
Long contractId = outsContractHistoryResp.getContractId();
ContractRespVO contract = contractService.getContract(contractId);
outsContractHistoryResp.setName(contract.getName());
outsContractHistoryResp.setTrackingDep(contract.getTrackingDep());
outsContractHistoryResp.setProjectManager(contract.getProjectManager());
outsContractHistoryResp.setOutsAmount(contract.getAmount());
return outsContractHistoryResp;
}
@Override
public PageResult<OutsContractHistoryDO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) {
return outsContractHistoryMapper.selectPage(pageReqVO);
public PageResult<OutsContractHistoryRespVO> getOutsContractHistoryPage(OutsContractHistoryPageReqVO pageReqVO) {
if (pageReqVO == null) {
throw exception(PARAM_NOT_EXISTS);
}
Long projectId = pageReqVO.getProjectId();
ProjectRespDTO project = projectApi.getProject(projectId);
if (project == null) {
throw exception(PROJECT_NOT_EXISTS);
}
PageResult<OutsContractHistoryDO> outsContractHistoryPage = outsContractHistoryMapper.selectPage(pageReqVO);
List<OutsContractHistoryDO> outsContractDOList = outsContractHistoryPage.getList();
List<OutsContractHistoryRespVO> outsContractRespVOList = new ArrayList<>();
for (OutsContractHistoryDO outsContractHistoryDO : outsContractDOList) {
Long id = outsContractHistoryDO.getId();
OutsContractHistoryRespVO outsContractHistory = getOutsContractHistory(id);
outsContractRespVOList.add(outsContractHistory);
}
PageResult<OutsContractHistoryRespVO> pageResult = new PageResult<>();
pageResult.setList(outsContractRespVOList);
return pageResult;
}
}

71
yudao-ui/yudao-ui-admin-vue3-ExtContractHistory/src/api/cms/extcontracthistory/index.ts Normal file
View File

@ -0,0 +1,71 @@
import request from '@/config/axios'
// 外部合同 VO
export interface ExtContractHistoryVO {
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
processInstanceId: string // 流程实体id
processStatus: string // 流程状态
contractId: number // 合同id
extContractId: number // 外部合同id
version: string // 版本
}
// 外部合同 API
export const ExtContractHistoryApi = {
// 查询外部合同分页
getExtContractHistoryPage: async (params: any) => {
return await request.get({ url: `/cms/ext-contract-history/page`, params })
},
// 查询外部合同详情
getExtContractHistory: async (id: number) => {
return await request.get({ url: `/cms/ext-contract-history/get?id=` + id })
},
// 新增外部合同
createExtContractHistory: async (data: ExtContractHistoryVO) => {
return await request.post({ url: `/cms/ext-contract-history/create`, data })
},
// 修改外部合同
updateExtContractHistory: async (data: ExtContractHistoryVO) => {
return await request.put({ url: `/cms/ext-contract-history/update`, data })
},
// 删除外部合同
deleteExtContractHistory: async (id: number) => {
return await request.delete({ url: `/cms/ext-contract-history/delete?id=` + id })
},
// 导出外部合同 Excel
exportExtContractHistory: async (params) => {
return await request.download({ url: `/cms/ext-contract-history/export-excel`, params })
},
}

300
yudao-ui/yudao-ui-admin-vue3-ExtContractHistory/src/views/cms/extcontracthistory/ExtContractHistoryForm.vue Normal file
View File

@ -0,0 +1,300 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
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="合同名称" 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-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>
<el-form-item label="预计签订时间" prop="expectedTime">
<el-date-picker
v-model="formData.expectedTime"
type="date"
value-format="x"
placeholder="选择预计签订时间"
/>
</el-form-item>
<el-form-item label="签订时间" prop="signingTime">
<el-date-picker
v-model="formData.signingTime"
type="date"
value-format="x"
placeholder="选择签订时间"
/>
</el-form-item>
<el-form-item label="归档时间" prop="archiveTime">
<el-date-picker
v-model="formData.archiveTime"
type="date"
value-format="x"
placeholder="选择归档时间"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</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="designFee">
<el-input v-model="formData.designFee" 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="testingFee">
<el-input v-model="formData.testingFee" placeholder="请输入检测费" />
</el-form-item>
<el-form-item label="其他费" prop="otherFee">
<el-input v-model="formData.otherFee" placeholder="请输入其他费" />
</el-form-item>
<el-form-item label="计费方式" prop="countType">
<el-select v-model="formData.countType" placeholder="请选择计费方式">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.CONTRACT_BILLING_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="合同附件url" prop="contractFileUrl">
<UploadFile v-model="formData.contractFileUrl" />
</el-form-item>
<el-form-item label="建安费" prop="constructionCost">
<el-input v-model="formData.constructionCost" placeholder="请输入建安费" />
</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-select>
</el-form-item>
<el-form-item label="收费标准" prop="chargingStandard">
<el-input v-model="formData.chargingStandard" placeholder="请输入收费标准" />
</el-form-item>
<el-form-item label="优惠" prop="discount">
<el-input v-model="formData.discount" placeholder="请输入优惠" />
</el-form-item>
<el-form-item label="是否联合体" prop="consortium">
<el-radio-group v-model="formData.consortium">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="联合体单位" prop="consortiumCompany">
<el-input v-model="formData.consortiumCompany" placeholder="请输入联合体单位" />
</el-form-item>
<el-form-item label="合同提示时间" prop="reminderTime">
<el-date-picker
v-model="formData.reminderTime"
type="date"
value-format="x"
placeholder="选择合同提示时间"
/>
</el-form-item>
<el-form-item label="审定金额" prop="approvedAmount">
<el-input v-model="formData.approvedAmount" placeholder="请输入审定金额" />
</el-form-item>
<el-form-item label="审核文件url" prop="reviewFileUrl">
<UploadFile v-model="formData.reviewFileUrl" />
</el-form-item>
<el-form-item label="流程实体id" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实体id" />
</el-form-item>
<el-form-item label="流程状态" prop="processStatus">
<el-select v-model="formData.processStatus" placeholder="请选择流程状态">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="合同id" prop="contractId">
<el-input v-model="formData.contractId" 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="version">
<el-input v-model="formData.version" placeholder="请输入版本" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { ExtContractHistoryApi, ExtContractHistoryVO } from '@/api/cms/extcontracthistory'
/** 外部合同 表单 */
defineOptions({ name: 'ExtContractHistoryForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
projectId: undefined,
name: undefined,
type: undefined,
customerCompanyId: undefined,
progress: undefined,
expectedTime: undefined,
signingTime: undefined,
archiveTime: undefined,
status: undefined,
amount: undefined,
preAmount: undefined,
designFee: undefined,
surveyFees: undefined,
testingFee: undefined,
otherFee: undefined,
countType: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
source: undefined,
chargingStandard: undefined,
discount: undefined,
consortium: undefined,
consortiumCompany: undefined,
reminderTime: undefined,
approvedAmount: undefined,
reviewFileUrl: undefined,
processInstanceId: undefined,
processStatus: undefined,
contractId: undefined,
extContractId: undefined,
version: 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: 'blur' }],
consortium: [{ required: true, message: '是否联合体不能为空', trigger: 'blur' }],
})
const formRef = ref() // 表单 Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
formData.value = await ExtContractHistoryApi.getExtContractHistory(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as ExtContractHistoryVO
if (formType.value === 'create') {
await ExtContractHistoryApi.createExtContractHistory(data)
message.success(t('common.createSuccess'))
} else {
await ExtContractHistoryApi.updateExtContractHistory(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
projectId: undefined,
name: undefined,
type: undefined,
customerCompanyId: undefined,
progress: undefined,
expectedTime: undefined,
signingTime: undefined,
archiveTime: undefined,
status: undefined,
amount: undefined,
preAmount: undefined,
designFee: undefined,
surveyFees: undefined,
testingFee: undefined,
otherFee: undefined,
countType: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
source: undefined,
chargingStandard: undefined,
discount: undefined,
consortium: undefined,
consortiumCompany: undefined,
reminderTime: undefined,
approvedAmount: undefined,
reviewFileUrl: undefined,
processInstanceId: undefined,
processStatus: undefined,
contractId: undefined,
extContractId: undefined,
version: undefined,
}
formRef.value?.resetFields()
}
</script>

567
yudao-ui/yudao-ui-admin-vue3-ExtContractHistory/src/views/cms/extcontracthistory/index.vue Normal file
View File

@ -0,0 +1,567 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="主键" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入主键"
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"
placeholder="请输入合同名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="合同类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择合同类型"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" 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"
placeholder="请输入合同进展"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="预计签订时间" prop="expectedTime">
<el-date-picker
v-model="queryParams.expectedTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="签订时间" prop="signingTime">
<el-date-picker
v-model="queryParams.signingTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="归档时间" prop="archiveTime">
<el-date-picker
v-model="queryParams.archiveTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</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="preAmount">
<el-input
v-model="queryParams.preAmount"
placeholder="请输入前期费用"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设计费" prop="designFee">
<el-input
v-model="queryParams.designFee"
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="testingFee">
<el-input
v-model="queryParams.testingFee"
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 label="计费方式" prop="countType">
<el-select
v-model="queryParams.countType"
placeholder="请选择计费方式"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.CONTRACT_BILLING_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="建安费" prop="constructionCost">
<el-input
v-model="queryParams.constructionCost"
placeholder="请输入建安费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="资金来源" prop="source">
<el-select
v-model="queryParams.source"
placeholder="请选择资金来源"
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-select>
</el-form-item>
<el-form-item label="收费标准" prop="chargingStandard">
<el-input
v-model="queryParams.chargingStandard"
placeholder="请输入收费标准"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="优惠" prop="discount">
<el-input
v-model="queryParams.discount"
placeholder="请输入优惠"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="是否联合体" prop="consortium">
<el-select
v-model="queryParams.consortium"
placeholder="请选择是否联合体"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="联合体单位" prop="consortiumCompany">
<el-input
v-model="queryParams.consortiumCompany"
placeholder="请输入联合体单位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="合同提示时间" prop="reminderTime">
<el-date-picker
v-model="queryParams.reminderTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="审定金额" prop="approvedAmount">
<el-input
v-model="queryParams.approvedAmount"
placeholder="请输入审定金额"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="流程实体id" prop="processInstanceId">
<el-input
v-model="queryParams.processInstanceId"
placeholder="请输入流程实体id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="流程状态" prop="processStatus">
<el-select
v-model="queryParams.processStatus"
placeholder="请选择流程状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<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="extContractId">
<el-input
v-model="queryParams.extContractId"
placeholder="请输入外部合同id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="版本" prop="version">
<el-input
v-model="queryParams.version"
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>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['cms:ext-contract-history:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['cms:ext-contract-history:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<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="合同名称" 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="progress" />
<el-table-column
label="预计签订时间"
align="center"
prop="expectedTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="签订时间"
align="center"
prop="signingTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="归档时间"
align="center"
prop="archiveTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="状态" align="center" prop="status" />
<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" />
<el-table-column label="检测费" align="center" prop="testingFee" />
<el-table-column label="其他费" align="center" prop="otherFee" />
<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="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="chargingStandard" />
<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="reminderTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
<el-table-column label="审核文件url" align="center" prop="reviewFileUrl" />
<el-table-column label="流程实体id" align="center" prop="processInstanceId" />
<el-table-column label="流程状态" align="center" prop="processStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.processStatus" />
</template>
</el-table-column>
<el-table-column label="合同id" align="center" prop="contractId" />
<el-table-column label="外部合同id" align="center" prop="extContractId" />
<el-table-column label="版本" align="center" prop="version" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['cms:ext-contract-history:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['cms:ext-contract-history:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<ExtContractHistoryForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ExtContractHistoryApi, ExtContractHistoryVO } from '@/api/cms/extcontracthistory'
import ExtContractHistoryForm from './ExtContractHistoryForm.vue'
/** 外部合同 列表 */
defineOptions({ name: 'ExtContractHistory' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<ExtContractHistoryVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
projectId: undefined,
name: undefined,
type: undefined,
customerCompanyId: undefined,
progress: undefined,
expectedTime: [],
signingTime: [],
archiveTime: [],
status: undefined,
amount: undefined,
preAmount: undefined,
designFee: undefined,
surveyFees: undefined,
testingFee: undefined,
otherFee: undefined,
countType: undefined,
remark: undefined,
contractFileUrl: undefined,
constructionCost: undefined,
source: undefined,
chargingStandard: undefined,
discount: undefined,
consortium: undefined,
consortiumCompany: undefined,
reminderTime: [],
approvedAmount: undefined,
reviewFileUrl: undefined,
processInstanceId: undefined,
processStatus: undefined,
contractId: undefined,
extContractId: undefined,
version: undefined,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ExtContractHistoryApi.getExtContractHistoryPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await ExtContractHistoryApi.deleteExtContractHistory(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await ExtContractHistoryApi.exportExtContractHistory(queryParams)
download.excel(data, '外部合同.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>