mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-07-15 19:45:06 +08:00
[fix] 更新各个合同模块的字段
This commit is contained in:
@ -1,55 +1,55 @@
|
|||||||
-- 菜单 SQL
|
-- 菜单 SQL
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status, component_name
|
path, icon, component, status, component_name
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同管理', '', 2, 0, 2758,
|
'外部合同管理管理', '', 2, 0, 2758,
|
||||||
'ext-contract', '', 'cms-ext/extcontract/index', 0, 'ExtContract'
|
'ext-contract', '', 'cms/extcontract/index', 0, 'ExtContract'
|
||||||
);
|
);
|
||||||
|
|
||||||
-- 按钮父菜单ID
|
-- 按钮父菜单ID
|
||||||
-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
|
-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话,需要手动修改 @parentId 的部分的代码
|
||||||
SELECT @parentId := LAST_INSERT_ID();
|
SELECT @parentId := LAST_INSERT_ID();
|
||||||
|
|
||||||
-- 按钮 SQL
|
-- 按钮 SQL
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status
|
path, icon, component, status
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同查询', 'cms-ext:ext-contract:query', 3, 1, @parentId,
|
'外部合同管理查询', 'cms:ext-contract:query', 3, 1, @parentId,
|
||||||
'', '', '', 0
|
'', '', '', 0
|
||||||
);
|
);
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status
|
path, icon, component, status
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同创建', 'cms-ext:ext-contract:create', 3, 2, @parentId,
|
'外部合同管理创建', 'cms:ext-contract:create', 3, 2, @parentId,
|
||||||
'', '', '', 0
|
'', '', '', 0
|
||||||
);
|
);
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status
|
path, icon, component, status
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同更新', 'cms-ext:ext-contract:update', 3, 3, @parentId,
|
'外部合同管理更新', 'cms:ext-contract:update', 3, 3, @parentId,
|
||||||
'', '', '', 0
|
'', '', '', 0
|
||||||
);
|
);
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status
|
path, icon, component, status
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同删除', 'cms-ext:ext-contract:delete', 3, 4, @parentId,
|
'外部合同管理删除', 'cms:ext-contract:delete', 3, 4, @parentId,
|
||||||
'', '', '', 0
|
'', '', '', 0
|
||||||
);
|
);
|
||||||
INSERT INTO system_menu(
|
INSERT INTO system_menu(
|
||||||
name, permission, type, sort, parent_id,
|
name, permission, type, sort, parent_id,
|
||||||
path, icon, component, status
|
path, icon, component, status
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
'外部合同导出', 'cms-ext:ext-contract:export', 3, 5, @parentId,
|
'外部合同管理导出', 'cms:ext-contract:export', 3, 5, @parentId,
|
||||||
'', '', '', 0
|
'', '', '', 0
|
||||||
);
|
);
|
@ -1,31 +0,0 @@
|
|||||||
-- 菜单 SQL
|
|
||||||
INSERT INTO system_menu(name, permission, type, sort, parent_id,
|
|
||||||
path, icon, component, status, component_name)
|
|
||||||
VALUES ('合同管理', '', 2, 0, 2758,
|
|
||||||
'contract', '', 'cms/contract/index', 0, 'Contract');
|
|
||||||
|
|
||||||
-- 按钮父菜单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:contract:query', 3, 1, @parentId,
|
|
||||||
'', '', '', 0);
|
|
||||||
INSERT INTO system_menu(name, permission, type, sort, parent_id,
|
|
||||||
path, icon, component, status)
|
|
||||||
VALUES ('合同创建', 'cms:contract:create', 3, 2, @parentId,
|
|
||||||
'', '', '', 0);
|
|
||||||
INSERT INTO system_menu(name, permission, type, sort, parent_id,
|
|
||||||
path, icon, component, status)
|
|
||||||
VALUES ('合同更新', 'cms:contract:update', 3, 3, @parentId,
|
|
||||||
'', '', '', 0);
|
|
||||||
INSERT INTO system_menu(name, permission, type, sort, parent_id,
|
|
||||||
path, icon, component, status)
|
|
||||||
VALUES ('合同删除', 'cms:contract:delete', 3, 4, @parentId,
|
|
||||||
'', '', '', 0);
|
|
||||||
INSERT INTO system_menu(name, permission, type, sort, parent_id,
|
|
||||||
path, icon, component, status)
|
|
||||||
VALUES ('合同导出', 'cms:contract:export', 3, 5, @parentId,
|
|
||||||
'', '', '', 0);
|
|
55
sql/cms/codegen-contract-sql.sql
Normal file
55
sql/cms/codegen-contract-sql.sql
Normal 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,
|
||||||
|
'contract', '', 'cms/contract/index', 0, 'Contract'
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 按钮父菜单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:contract:query', 3, 1, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'合同管理创建', 'cms:contract:create', 3, 2, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'合同管理更新', 'cms:contract:update', 3, 3, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'合同管理删除', 'cms:contract:delete', 3, 4, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'合同管理导出', 'cms:contract:export', 3, 5, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
55
sql/pms/codegen-ProjectSchedule-sql.sql
Normal file
55
sql/pms/codegen-ProjectSchedule-sql.sql
Normal 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, 2759,
|
||||||
|
'project-schedule', '', 'pms/projectschedule/index', 0, 'ProjectSchedule'
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 按钮父菜单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 (
|
||||||
|
'项目进度管理查询', 'pms:project-schedule:query', 3, 1, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'项目进度管理创建', 'pms:project-schedule:create', 3, 2, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'项目进度管理更新', 'pms:project-schedule:update', 3, 3, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'项目进度管理删除', 'pms:project-schedule:delete', 3, 4, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
||||||
|
INSERT INTO system_menu(
|
||||||
|
name, permission, type, sort, parent_id,
|
||||||
|
path, icon, component, status
|
||||||
|
)
|
||||||
|
VALUES (
|
||||||
|
'项目进度管理导出', 'pms:project-schedule:export', 3, 5, @parentId,
|
||||||
|
'', '', '', 0
|
||||||
|
);
|
@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||||
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
@ -18,6 +19,20 @@ import com.alibaba.excel.annotation.*;
|
|||||||
public class ContractRespVO {
|
public class ContractRespVO {
|
||||||
|
|
||||||
|
|
||||||
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "19374")
|
||||||
|
@ExcelProperty("主键")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1381")
|
||||||
|
@ExcelProperty("项目id")
|
||||||
|
private Long projectId;
|
||||||
|
|
||||||
|
@Schema(description = "外部合同id", example = "32057")
|
||||||
|
@ExcelProperty("外部合同id")
|
||||||
|
private Long extContractId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
||||||
@ExcelProperty("项目编号")
|
@ExcelProperty("项目编号")
|
||||||
private String code;
|
private String code;
|
||||||
@ -26,32 +41,30 @@ public class ContractRespVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "分包合同提示时间")
|
@Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
|
||||||
@ExcelProperty("分包合同提示时间")
|
@ExcelProperty("预计合同金额")
|
||||||
private LocalDateTime ReminderTime;
|
private BigDecimal expectedContractAmount;
|
||||||
|
|
||||||
@Schema(description = "暂定结算数")
|
@Schema(description = "合同商议提示")
|
||||||
@ExcelProperty("暂定结算数")
|
@ExcelProperty("合同商议提示")
|
||||||
private BigDecimal provisionalSettlement;
|
private LocalDateTime reminderTime;
|
||||||
|
|
||||||
@Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
|
@Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
|
||||||
@ExcelProperty("出图公司")
|
@ExcelProperty("出图公司")
|
||||||
private String drawingCompany;
|
private String drawingCompany;
|
||||||
|
|
||||||
@Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
|
|
||||||
@ExcelProperty("预计合同金额")
|
|
||||||
private BigDecimal expectedContractAmount;
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
|
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
|
||||||
@ExcelProperty("合同名称")
|
@ExcelProperty("合同名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
@Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
@ExcelProperty("合同类型")
|
@ExcelProperty("合同类型")
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
||||||
private String type;
|
private String type;
|
||||||
@ -76,16 +89,23 @@ public class ContractRespVO {
|
|||||||
@ExcelProperty("归档时间")
|
@ExcelProperty("归档时间")
|
||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
|
|
||||||
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
||||||
@ExcelProperty("合同状态")
|
@ExcelProperty(value = "合同状态", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
@Schema(description = "计费方式", example = "1")
|
@Schema(description = "签订合同总额")
|
||||||
@ExcelProperty("计费方式")
|
@ExcelProperty("签订合同总额")
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
@Schema(description = "计费方式", example = "2")
|
||||||
|
@ExcelProperty(value = "计费方式", converter = DictConvert.class)
|
||||||
|
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
||||||
private String countType;
|
private String countType;
|
||||||
|
|
||||||
|
@Schema(description = "暂定结算数")
|
||||||
|
@ExcelProperty("暂定结算数")
|
||||||
|
private BigDecimal provisionalSettlement;
|
||||||
|
|
||||||
@Schema(description = "备注", example = "随便")
|
@Schema(description = "备注", example = "随便")
|
||||||
@ExcelProperty("备注")
|
@ExcelProperty("备注")
|
||||||
@ -101,12 +121,11 @@ public class ContractRespVO {
|
|||||||
|
|
||||||
@Schema(description = "资金来源")
|
@Schema(description = "资金来源")
|
||||||
@ExcelProperty("资金来源")
|
@ExcelProperty("资金来源")
|
||||||
@DictFormat(DictTypeConstants.SOURCE)
|
|
||||||
private String source;
|
private String source;
|
||||||
|
|
||||||
@Schema(description = "优惠", example = "17910")
|
@Schema(description = "优惠", example = "19163")
|
||||||
@ExcelProperty("优惠")
|
@ExcelProperty("优惠")
|
||||||
private String discount;
|
private BigDecimal discount;
|
||||||
|
|
||||||
@Schema(description = "是否联合体")
|
@Schema(description = "是否联合体")
|
||||||
@ExcelProperty("是否联合体")
|
@ExcelProperty("是否联合体")
|
||||||
@ -118,7 +137,7 @@ public class ContractRespVO {
|
|||||||
|
|
||||||
@Schema(description = "占主合同比例")
|
@Schema(description = "占主合同比例")
|
||||||
@ExcelProperty("占主合同比例")
|
@ExcelProperty("占主合同比例")
|
||||||
private String extProportion;
|
private BigDecimal extProportion;
|
||||||
|
|
||||||
@Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("审定金额")
|
@ExcelProperty("审定金额")
|
||||||
@ -128,28 +147,11 @@ public class ContractRespVO {
|
|||||||
@ExcelProperty("审核文件url")
|
@ExcelProperty("审核文件url")
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
|
|
||||||
@Schema(description = "签订合同总额")
|
@Schema(description = "最后编辑人")
|
||||||
@ExcelProperty("签订合同总额")
|
@ExcelProperty("最后编辑人")
|
||||||
private BigDecimal amount;
|
private String finalEditor;
|
||||||
|
|
||||||
@Schema(description = "前期费")
|
|
||||||
@ExcelProperty("前期费")
|
|
||||||
private BigDecimal preAmount;
|
|
||||||
|
|
||||||
@Schema(description = "设计费")
|
|
||||||
@ExcelProperty("设计费")
|
|
||||||
private BigDecimal designAmount;
|
|
||||||
|
|
||||||
@Schema(description = "勘测费")
|
|
||||||
@ExcelProperty("勘测费")
|
|
||||||
private BigDecimal surveyFees;
|
|
||||||
|
|
||||||
@Schema(description = "测量费")
|
|
||||||
@ExcelProperty("测量费")
|
|
||||||
private BigDecimal measurementFee;
|
|
||||||
|
|
||||||
@Schema(description = "其他费")
|
|
||||||
@ExcelProperty("其他费")
|
|
||||||
private BigDecimal otherFee;
|
|
||||||
|
|
||||||
}
|
}
|
@ -1,10 +1,12 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
|
package cn.iocoder.yudao.module.cms.controller.admin.contract.vo;
|
||||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import jakarta.validation.constraints.*;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@ -13,12 +15,20 @@ import java.time.LocalDateTime;
|
|||||||
@EqualsAndHashCode
|
@EqualsAndHashCode
|
||||||
public class ContractSaveReqVO {
|
public class ContractSaveReqVO {
|
||||||
|
|
||||||
@Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "19374")
|
||||||
|
@ExcelProperty("主键")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1381")
|
||||||
|
@ExcelProperty("项目id")
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
|
||||||
|
@Schema(description = "外部合同id", example = "32057")
|
||||||
|
@ExcelProperty("外部合同id")
|
||||||
|
private Long extContractId;
|
||||||
|
|
||||||
|
//
|
||||||
|
|
||||||
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
||||||
@ExcelProperty("项目编号")
|
@ExcelProperty("项目编号")
|
||||||
private String code;
|
private String code;
|
||||||
@ -27,112 +37,114 @@ public class ContractSaveReqVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "分包合同提示时间")
|
|
||||||
@ExcelProperty("分包合同提示时间")
|
|
||||||
private LocalDateTime reminderTime;
|
|
||||||
|
|
||||||
@Schema(description = "暂定结算数")
|
|
||||||
@ExcelProperty("暂定结算数")
|
|
||||||
private BigDecimal provisionalSettlement;
|
|
||||||
|
|
||||||
@Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
|
|
||||||
@ExcelProperty("出图公司")
|
|
||||||
private String drawingCompany;
|
|
||||||
|
|
||||||
@Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
|
@Schema(description = "预计合同金额", requiredMode = Schema.RequiredMode.REQUIRED,example = "200.0000")
|
||||||
@ExcelProperty("预计合同金额")
|
@ExcelProperty("预计合同金额")
|
||||||
private BigDecimal expectedContractAmount;
|
private BigDecimal expectedContractAmount;
|
||||||
|
|
||||||
|
@Schema(description = "合同商议提示")
|
||||||
|
@ExcelProperty("合同商议提示")
|
||||||
|
private LocalDateTime reminderTime;
|
||||||
|
|
||||||
|
@Schema(description = "出图公司", requiredMode = Schema.RequiredMode.REQUIRED,example = "***设计院")
|
||||||
|
@ExcelProperty("出图公司")
|
||||||
|
private String drawingCompany;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
|
@Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
|
||||||
@NotEmpty(message = "合同名称不能为空")
|
@ExcelProperty("合同名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
@Schema(description = "合同类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
@NotEmpty(message = "合同类型不能为空")
|
@ExcelProperty("合同类型")
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
@Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "合同进展", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotEmpty(message = "合同进展不能为空")
|
@ExcelProperty("合同进展")
|
||||||
private String progress;
|
private String progress;
|
||||||
|
|
||||||
@Schema(description = "合同拟定时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "合同拟定时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "合同拟定时间不能为空")
|
@ExcelProperty("合同拟定时间")
|
||||||
private LocalDateTime expectedTime;
|
private LocalDateTime expectedTime;
|
||||||
|
|
||||||
@Schema(description = "合同用印时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "合同用印时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "合同用印时间不能为空")
|
@ExcelProperty("合同用印时间")
|
||||||
private LocalDateTime printingTime;
|
private LocalDateTime printingTime;
|
||||||
|
|
||||||
@Schema(description = "签订时间")
|
@Schema(description = "签订时间")
|
||||||
|
@ExcelProperty("签订时间")
|
||||||
private LocalDateTime signingTime;
|
private LocalDateTime signingTime;
|
||||||
|
|
||||||
@Schema(description = "归档时间")
|
@Schema(description = "归档时间")
|
||||||
|
@ExcelProperty("归档时间")
|
||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
|
|
||||||
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
@Schema(description = "合同状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
||||||
@NotEmpty(message = "合同状态不能为空")
|
@ExcelProperty(value = "合同状态", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
@Schema(description = "计费方式", example = "1")
|
@Schema(description = "签订合同总额")
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
@ExcelProperty("签订合同总额")
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
@Schema(description = "计费方式", example = "2")
|
||||||
|
@ExcelProperty(value = "计费方式", converter = DictConvert.class)
|
||||||
|
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
||||||
private String countType;
|
private String countType;
|
||||||
|
|
||||||
|
@Schema(description = "暂定结算数")
|
||||||
|
@ExcelProperty("暂定结算数")
|
||||||
|
private BigDecimal provisionalSettlement;
|
||||||
|
|
||||||
@Schema(description = "备注", example = "随便")
|
@Schema(description = "备注", example = "随便")
|
||||||
|
@ExcelProperty("备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@Schema(description = "合同url", example = "https://www.iocoder.cn")
|
@Schema(description = "合同url", example = "https://www.iocoder.cn")
|
||||||
|
@ExcelProperty("合同url")
|
||||||
private String contractFileUrl;
|
private String contractFileUrl;
|
||||||
|
|
||||||
@Schema(description = "建安费")
|
@Schema(description = "建安费")
|
||||||
|
@ExcelProperty("建安费")
|
||||||
private BigDecimal constructionCost;
|
private BigDecimal constructionCost;
|
||||||
|
|
||||||
@Schema(description = "资金来源")
|
@Schema(description = "资金来源")
|
||||||
@DictFormat(DictTypeConstants.SOURCE)
|
@ExcelProperty("资金来源")
|
||||||
private String source;
|
private String source;
|
||||||
|
|
||||||
@Schema(description = "优惠", example = "17910")
|
@Schema(description = "优惠", example = "19163")
|
||||||
private String discount;
|
@ExcelProperty("优惠")
|
||||||
|
private BigDecimal discount;
|
||||||
|
|
||||||
@Schema(description = "是否联合体")
|
@Schema(description = "是否联合体")
|
||||||
|
@ExcelProperty("是否联合体")
|
||||||
private Boolean consortium;
|
private Boolean consortium;
|
||||||
|
|
||||||
@Schema(description = "联合体单位")
|
@Schema(description = "联合体单位")
|
||||||
|
@ExcelProperty("联合体单位")
|
||||||
private String consortiumCompany;
|
private String consortiumCompany;
|
||||||
|
|
||||||
@Schema(description = "占主合同比例")
|
@Schema(description = "占主合同比例")
|
||||||
private String extProportion;
|
@ExcelProperty("占主合同比例")
|
||||||
|
private BigDecimal extProportion;
|
||||||
|
|
||||||
@Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "审定金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "审定金额不能为空")
|
@ExcelProperty("审定金额")
|
||||||
private BigDecimal approvedAmount;
|
private BigDecimal approvedAmount;
|
||||||
|
|
||||||
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
|
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
|
||||||
|
@ExcelProperty("审核文件url")
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
|
|
||||||
@Schema(description = "签订合同总额")
|
@Schema(description = "最后编辑人")
|
||||||
private BigDecimal amount;
|
@ExcelProperty("最后编辑人")
|
||||||
|
private String finalEditor;
|
||||||
@Schema(description = "前期费")
|
|
||||||
private BigDecimal preAmount;
|
|
||||||
|
|
||||||
@Schema(description = "设计费")
|
|
||||||
private BigDecimal designAmount;
|
|
||||||
|
|
||||||
@Schema(description = "勘测费")
|
|
||||||
private BigDecimal surveyFees;
|
|
||||||
|
|
||||||
@Schema(description = "测量费")
|
|
||||||
private BigDecimal measurementFee;
|
|
||||||
|
|
||||||
@Schema(description = "其他费")
|
|
||||||
private BigDecimal otherFee;
|
|
||||||
|
|
||||||
}
|
}
|
@ -1,94 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.customerCompany;
|
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import jakarta.annotation.Resource;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
|
||||||
|
|
||||||
import jakarta.validation.*;
|
|
||||||
import jakarta.servlet.http.*;
|
|
||||||
import java.util.*;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
||||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
||||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
|
||||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
|
|
||||||
import cn.iocoder.yudao.module.cms.service.customerCompany.CustomerCompanyService;
|
|
||||||
|
|
||||||
@Tag(name = "管理后台 - 客户公司")
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/cms/customer-company")
|
|
||||||
@Validated
|
|
||||||
public class CustomerCompanyController {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private CustomerCompanyService customerCompanyService;
|
|
||||||
|
|
||||||
@PostMapping("/create")
|
|
||||||
@Operation(summary = "创建客户公司")
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:create')")
|
|
||||||
public CommonResult<Long> createCustomerCompany(@Valid @RequestBody CustomerCompanySaveReqVO createReqVO) {
|
|
||||||
return success(customerCompanyService.createCustomerCompany(createReqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/update")
|
|
||||||
@Operation(summary = "更新客户公司")
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:update')")
|
|
||||||
public CommonResult<Boolean> updateCustomerCompany(@Valid @RequestBody CustomerCompanySaveReqVO updateReqVO) {
|
|
||||||
customerCompanyService.updateCustomerCompany(updateReqVO);
|
|
||||||
return success(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/delete")
|
|
||||||
@Operation(summary = "删除客户公司")
|
|
||||||
@Parameter(name = "id", description = "编号", required = true)
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:delete')")
|
|
||||||
public CommonResult<Boolean> deleteCustomerCompany(@RequestParam("id") Long id) {
|
|
||||||
customerCompanyService.deleteCustomerCompany(id);
|
|
||||||
return success(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/get")
|
|
||||||
@Operation(summary = "获得客户公司")
|
|
||||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:query')")
|
|
||||||
public CommonResult<CustomerCompanyRespVO> getCustomerCompany(@RequestParam("id") Long id) {
|
|
||||||
CustomerCompanyDO customerCompany = customerCompanyService.getCustomerCompany(id);
|
|
||||||
return success(BeanUtils.toBean(customerCompany, CustomerCompanyRespVO.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/page")
|
|
||||||
@Operation(summary = "获得客户公司分页")
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:query')")
|
|
||||||
public CommonResult<PageResult<CustomerCompanyRespVO>> getCustomerCompanyPage(@Valid CustomerCompanyPageReqVO pageReqVO) {
|
|
||||||
PageResult<CustomerCompanyDO> pageResult = customerCompanyService.getCustomerCompanyPage(pageReqVO);
|
|
||||||
return success(BeanUtils.toBean(pageResult, CustomerCompanyRespVO.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/export-excel")
|
|
||||||
@Operation(summary = "导出客户公司 Excel")
|
|
||||||
@PreAuthorize("@ss.hasPermission('cms:customer-company:export')")
|
|
||||||
@ApiAccessLog(operateType = EXPORT)
|
|
||||||
public void exportCustomerCompanyExcel(@Valid CustomerCompanyPageReqVO pageReqVO,
|
|
||||||
HttpServletResponse response) throws IOException {
|
|
||||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
|
||||||
List<CustomerCompanyDO> list = customerCompanyService.getCustomerCompanyPage(pageReqVO).getList();
|
|
||||||
// 导出 Excel
|
|
||||||
ExcelUtils.write(response, "客户公司.xls", "数据", CustomerCompanyRespVO.class,
|
|
||||||
BeanUtils.toBean(list, CustomerCompanyRespVO.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,30 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
|
|
||||||
|
|
||||||
import lombok.*;
|
|
||||||
import java.util.*;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 客户公司分页 Request VO")
|
|
||||||
@Data
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class CustomerCompanyPageReqVO extends PageParam {
|
|
||||||
|
|
||||||
@Schema(description = "联系人", example = "张三")
|
|
||||||
private String contacts;
|
|
||||||
|
|
||||||
@Schema(description = "公司名称", example = "电力公司")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Schema(description = "地址")
|
|
||||||
private String address;
|
|
||||||
|
|
||||||
@Schema(description = "电话")
|
|
||||||
private String phone;
|
|
||||||
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
|
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import lombok.*;
|
|
||||||
import java.util.*;
|
|
||||||
import com.alibaba.excel.annotation.*;
|
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 客户公司 Response VO")
|
|
||||||
@Data
|
|
||||||
@ExcelIgnoreUnannotated
|
|
||||||
public class CustomerCompanyRespVO {
|
|
||||||
|
|
||||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14907")
|
|
||||||
@ExcelProperty("主键")
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
|
||||||
@ExcelProperty("联系人")
|
|
||||||
private String contacts;
|
|
||||||
|
|
||||||
@Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "电力公司")
|
|
||||||
@ExcelProperty("公司名称")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Schema(description = "地址")
|
|
||||||
@ExcelProperty("地址")
|
|
||||||
private String address;
|
|
||||||
|
|
||||||
@Schema(description = "电话")
|
|
||||||
@ExcelProperty("电话")
|
|
||||||
private String phone;
|
|
||||||
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.customerCompany.vo;
|
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import lombok.*;
|
|
||||||
import java.util.*;
|
|
||||||
import jakarta.validation.constraints.*;
|
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 客户公司新增/修改 Request VO")
|
|
||||||
@Data
|
|
||||||
public class CustomerCompanySaveReqVO {
|
|
||||||
|
|
||||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14907")
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
|
||||||
@NotEmpty(message = "联系人不能为空")
|
|
||||||
private String contacts;
|
|
||||||
|
|
||||||
@Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "电力公司")
|
|
||||||
@NotEmpty(message = "公司名称不能为空")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Schema(description = "地址")
|
|
||||||
private String address;
|
|
||||||
|
|
||||||
@Schema(description = "电话")
|
|
||||||
private String phone;
|
|
||||||
|
|
||||||
}
|
|
@ -1,9 +1,9 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;
|
package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||||
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@ -14,21 +14,25 @@ import com.alibaba.excel.annotation.*;
|
|||||||
@ExcelIgnoreUnannotated
|
@ExcelIgnoreUnannotated
|
||||||
public class ExtContractRespVO {
|
public class ExtContractRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "964")
|
||||||
|
@ExcelProperty("主键")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "合同id", example = "13085")
|
||||||
|
@ExcelProperty("合同id")
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16261")
|
||||||
|
@ExcelProperty("项目id")
|
||||||
|
private Long projectId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
||||||
@ExcelProperty("项目编号")
|
@ExcelProperty("项目编号")
|
||||||
private String code;
|
private String code;
|
||||||
|
|
||||||
@Schema(description = "合同名称", example = "芋艿")
|
|
||||||
@ExcelProperty("合同名称")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Schema(description = "合同类型", example = "1")
|
|
||||||
@ExcelProperty("合同类型")
|
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
|
||||||
private String type;
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "客户名称")
|
@Schema(description = "客户名称")
|
||||||
@ExcelProperty("客户名称")
|
@ExcelProperty("客户名称")
|
||||||
private String customerCompanyName;
|
private String customerCompanyName;
|
||||||
@ -37,14 +41,27 @@ public class ExtContractRespVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "合同商议提示时间")
|
@Schema(description = "外部合同商议提示时间")
|
||||||
@ExcelProperty("合同商议提示时间")
|
@ExcelProperty("外部合同商议提示时间")
|
||||||
private LocalDateTime exReminderTime;
|
private LocalDateTime exReminderTime;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Schema(description = "合同名称", example = "赵六")
|
||||||
|
@ExcelProperty("合同名称")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "合同类型", example = "2")
|
||||||
|
@ExcelProperty(value = "合同类型", converter = DictConvert.class)
|
||||||
|
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
||||||
|
private String type;
|
||||||
|
|
||||||
@Schema(description = "合同进展")
|
@Schema(description = "合同进展")
|
||||||
@ExcelProperty("合同进展")
|
@ExcelProperty("合同进展")
|
||||||
private String progress;
|
private String progress;
|
||||||
@ -62,12 +79,12 @@ public class ExtContractRespVO {
|
|||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
|
|
||||||
@Schema(description = "状态", example = "2")
|
@Schema(description = "状态", example = "2")
|
||||||
@ExcelProperty("状态")
|
@ExcelProperty(value = "状态", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
@Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "合同总金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("合同金额")
|
@ExcelProperty("合同总金额")
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
|
|
||||||
@Schema(description = "前期费用")
|
@Schema(description = "前期费用")
|
||||||
@ -88,14 +105,14 @@ public class ExtContractRespVO {
|
|||||||
|
|
||||||
@Schema(description = "其他费")
|
@Schema(description = "其他费")
|
||||||
@ExcelProperty("其他费")
|
@ExcelProperty("其他费")
|
||||||
private String otherFee;
|
private BigDecimal otherFee;
|
||||||
|
|
||||||
@Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
@Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
@ExcelProperty("计费方式")
|
@ExcelProperty(value = "计费方式", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
||||||
private String countType;
|
private String countType;
|
||||||
|
|
||||||
@Schema(description = "备注", example = "你猜")
|
@Schema(description = "备注", example = "随便")
|
||||||
@ExcelProperty("备注")
|
@ExcelProperty("备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@ -108,22 +125,18 @@ public class ExtContractRespVO {
|
|||||||
private BigDecimal constructionCost;
|
private BigDecimal constructionCost;
|
||||||
|
|
||||||
@Schema(description = "资金来源")
|
@Schema(description = "资金来源")
|
||||||
@ExcelProperty("资金来源")
|
@ExcelProperty(value = "资金来源", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.SOURCE)
|
@DictFormat(DictTypeConstants.SOURCE)
|
||||||
private String source;
|
private String source;
|
||||||
|
|
||||||
@Schema(description = "分包合同提示时间")
|
|
||||||
@ExcelProperty("分包合同提示时间")
|
|
||||||
private LocalDateTime reminderTime;
|
|
||||||
|
|
||||||
@Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("收费标准")
|
@ExcelProperty(value = "收费标准", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CHARGING_STANDARD)
|
@DictFormat(DictTypeConstants.CHARGING_STANDARD)
|
||||||
private String chargingStandard;
|
private String chargingStandard;
|
||||||
|
|
||||||
@Schema(description = "优惠", example = "15529")
|
@Schema(description = "优惠", example = "123")
|
||||||
@ExcelProperty("优惠")
|
@ExcelProperty("优惠")
|
||||||
private String discount;
|
private BigDecimal discount;
|
||||||
|
|
||||||
@Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("是否联合体")
|
@ExcelProperty("是否联合体")
|
||||||
@ -133,6 +146,9 @@ public class ExtContractRespVO {
|
|||||||
@ExcelProperty("联合体单位")
|
@ExcelProperty("联合体单位")
|
||||||
private String consortiumCompany;
|
private String consortiumCompany;
|
||||||
|
|
||||||
|
@Schema(description = "合同商议提示")
|
||||||
|
@ExcelProperty("合同商议提示")
|
||||||
|
private LocalDateTime reminderTime;
|
||||||
|
|
||||||
@Schema(description = "审定金额")
|
@Schema(description = "审定金额")
|
||||||
@ExcelProperty("审定金额")
|
@ExcelProperty("审定金额")
|
||||||
@ -142,11 +158,7 @@ public class ExtContractRespVO {
|
|||||||
@ExcelProperty("审核文件url")
|
@ExcelProperty("审核文件url")
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
|
|
||||||
|
@Schema(description = "最后编辑人")
|
||||||
@Schema(description = "合同id", example = "27460")
|
@ExcelProperty("最后编辑人")
|
||||||
@ExcelProperty("合同id")
|
private String finalEditor;
|
||||||
private Long contractId;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -1,11 +1,11 @@
|
|||||||
package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;
|
package cn.iocoder.yudao.module.cms.controller.admin.extContract.vo;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
||||||
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import jakarta.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@ -14,13 +14,21 @@ import java.time.LocalDateTime;
|
|||||||
@Data
|
@Data
|
||||||
public class ExtContractSaveReqVO {
|
public class ExtContractSaveReqVO {
|
||||||
|
|
||||||
@Schema(description = "外部合同编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "964")
|
||||||
|
@ExcelProperty("主键")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30598")
|
@Schema(description = "合同id", example = "13085")
|
||||||
@NotNull(message = "项目id不能为空")
|
@ExcelProperty("合同id")
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16261")
|
||||||
|
@ExcelProperty("项目id")
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
@Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "SJ24001")
|
||||||
@ExcelProperty("项目编号")
|
@ExcelProperty("项目编号")
|
||||||
private String code;
|
private String code;
|
||||||
@ -33,107 +41,126 @@ public class ExtContractSaveReqVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "合同提示时间")
|
@Schema(description = "外部合同商议提示时间")
|
||||||
@ExcelProperty("合同提示时间")
|
@ExcelProperty("外部合同商议提示时间")
|
||||||
private LocalDateTime exReminderTime;
|
private LocalDateTime exReminderTime;
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "客户公司id", example = "25191")
|
|
||||||
private Long customerCompanyId;
|
|
||||||
|
|
||||||
@Schema(description = "合同名称", example = "芋艿")
|
|
||||||
|
|
||||||
|
@Schema(description = "合同名称", example = "赵六")
|
||||||
@ExcelProperty("合同名称")
|
@ExcelProperty("合同名称")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@Schema(description = "合同类型", example = "1")
|
@Schema(description = "合同类型", example = "2")
|
||||||
@ExcelProperty("合同类型")
|
@ExcelProperty(value = "合同类型", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
@DictFormat(DictTypeConstants.CONTRACT_TYPE)
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
@Schema(description = "合同进展")
|
@Schema(description = "合同进展")
|
||||||
|
@ExcelProperty("合同进展")
|
||||||
private String progress;
|
private String progress;
|
||||||
|
|
||||||
@Schema(description = "预计签订时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "预计签订时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "预计签订时间不能为空")
|
@ExcelProperty("预计签订时间")
|
||||||
private LocalDateTime expectedTime;
|
private LocalDateTime expectedTime;
|
||||||
|
|
||||||
@Schema(description = "签订时间")
|
@Schema(description = "签订时间")
|
||||||
|
@ExcelProperty("签订时间")
|
||||||
private LocalDateTime signingTime;
|
private LocalDateTime signingTime;
|
||||||
|
|
||||||
@Schema(description = "归档时间")
|
@Schema(description = "归档时间")
|
||||||
|
@ExcelProperty("归档时间")
|
||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
|
|
||||||
@Schema(description = "状态", example = "2")
|
@Schema(description = "状态", example = "2")
|
||||||
|
@ExcelProperty(value = "状态", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
@Schema(description = "合同金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "合同总金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "合同金额不能为空")
|
@ExcelProperty("合同总金额")
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
|
|
||||||
@Schema(description = "前期费用")
|
@Schema(description = "前期费用")
|
||||||
|
@ExcelProperty("前期费用")
|
||||||
private BigDecimal preAmount;
|
private BigDecimal preAmount;
|
||||||
|
|
||||||
@Schema(description = "设计费")
|
@Schema(description = "设计费")
|
||||||
|
@ExcelProperty("设计费")
|
||||||
private BigDecimal designFee;
|
private BigDecimal designFee;
|
||||||
|
|
||||||
@Schema(description = "勘测费")
|
@Schema(description = "勘测费")
|
||||||
|
@ExcelProperty("勘测费")
|
||||||
private BigDecimal surveyFees;
|
private BigDecimal surveyFees;
|
||||||
|
|
||||||
@Schema(description = "检测费")
|
@Schema(description = "检测费")
|
||||||
|
@ExcelProperty("检测费")
|
||||||
private BigDecimal testingFee;
|
private BigDecimal testingFee;
|
||||||
|
|
||||||
@Schema(description = "其他费")
|
@Schema(description = "其他费")
|
||||||
private String otherFee;
|
@ExcelProperty("其他费")
|
||||||
|
private BigDecimal otherFee;
|
||||||
|
|
||||||
@Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
@Schema(description = "计费方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
@NotEmpty(message = "计费方式不能为空")
|
@ExcelProperty(value = "计费方式", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
||||||
private String countType;
|
private String countType;
|
||||||
|
|
||||||
@Schema(description = "备注", example = "你猜")
|
@Schema(description = "备注", example = "随便")
|
||||||
|
@ExcelProperty("备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@Schema(description = "合同附件url", example = "https://www.iocoder.cn")
|
@Schema(description = "合同附件url", example = "https://www.iocoder.cn")
|
||||||
|
@ExcelProperty("合同附件url")
|
||||||
private String contractFileUrl;
|
private String contractFileUrl;
|
||||||
|
|
||||||
@Schema(description = "建安费")
|
@Schema(description = "建安费")
|
||||||
|
@ExcelProperty("建安费")
|
||||||
private BigDecimal constructionCost;
|
private BigDecimal constructionCost;
|
||||||
|
|
||||||
@Schema(description = "资金来源")
|
@Schema(description = "资金来源")
|
||||||
|
@ExcelProperty(value = "资金来源", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.SOURCE)
|
@DictFormat(DictTypeConstants.SOURCE)
|
||||||
private String source;
|
private String source;
|
||||||
|
|
||||||
@Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "收费标准", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotEmpty(message = "收费标准不能为空")
|
@ExcelProperty(value = "收费标准", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.CHARGING_STANDARD)
|
@DictFormat(DictTypeConstants.CHARGING_STANDARD)
|
||||||
private String chargingStandard;
|
private String chargingStandard;
|
||||||
|
|
||||||
@Schema(description = "优惠", example = "15529")
|
@Schema(description = "优惠", example = "123")
|
||||||
private String discount;
|
@ExcelProperty("优惠")
|
||||||
|
private BigDecimal discount;
|
||||||
|
|
||||||
@Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "是否联合体", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@NotNull(message = "是否联合体不能为空")
|
@ExcelProperty("是否联合体")
|
||||||
private Boolean consortium;
|
private Boolean consortium;
|
||||||
|
|
||||||
@Schema(description = "联合体单位")
|
@Schema(description = "联合体单位")
|
||||||
|
@ExcelProperty("联合体单位")
|
||||||
private String consortiumCompany;
|
private String consortiumCompany;
|
||||||
|
|
||||||
@Schema(description = "分包合同提示时间")
|
@Schema(description = "合同商议提示")
|
||||||
|
@ExcelProperty("合同商议提示")
|
||||||
private LocalDateTime reminderTime;
|
private LocalDateTime reminderTime;
|
||||||
|
|
||||||
@Schema(description = "审定金额")
|
@Schema(description = "审定金额")
|
||||||
|
@ExcelProperty("审定金额")
|
||||||
private BigDecimal approvedAmount;
|
private BigDecimal approvedAmount;
|
||||||
|
|
||||||
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
|
@Schema(description = "审核文件url", example = "https://www.iocoder.cn")
|
||||||
|
@ExcelProperty("审核文件url")
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
|
|
||||||
@Schema(description = "合同id", example = "27460")
|
@Schema(description = "最后编辑人")
|
||||||
private Long contractId;
|
@ExcelProperty("最后编辑人")
|
||||||
|
private String finalEditor;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -16,6 +16,20 @@ import java.time.LocalDateTime;
|
|||||||
@ExcelIgnoreUnannotated
|
@ExcelIgnoreUnannotated
|
||||||
public class OutsContractRespVO {
|
public class OutsContractRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
|
||||||
|
@ExcelProperty("主键")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
|
||||||
|
@ExcelProperty("项目id")
|
||||||
|
private Long projectId;
|
||||||
|
|
||||||
|
@Schema(description = "主合同id", example = "19816")
|
||||||
|
@ExcelProperty("主合同id")
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "合同名称", example = "张三")
|
@Schema(description = "合同名称", example = "张三")
|
||||||
@ExcelProperty("合同名称")
|
@ExcelProperty("合同名称")
|
||||||
private String name;
|
private String name;
|
||||||
@ -24,8 +38,8 @@ public class OutsContractRespVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "签订合同总额")
|
@Schema(description = "签订合同总额")
|
||||||
@ -33,28 +47,13 @@ public class OutsContractRespVO {
|
|||||||
private BigDecimal outsAmount;
|
private BigDecimal outsAmount;
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "外包合同编号")
|
|
||||||
@ExcelProperty("编号")
|
|
||||||
private String code;
|
|
||||||
|
|
||||||
@Schema(description = "外包单位")
|
|
||||||
@ExcelProperty("外包单位")
|
|
||||||
private String outsCompany;
|
|
||||||
|
|
||||||
@Schema(description = "主合同id", example = "19816")
|
|
||||||
@ExcelProperty("主合同id")
|
|
||||||
private Long contractId;
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "外包合同类型", example = "2")
|
@Schema(description = "类型", example = "2")
|
||||||
@ExcelProperty(value = "外包合同类型", converter = DictConvert.class)
|
@ExcelProperty(value = "类型", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
private String countType;
|
private String countType;
|
||||||
|
|
||||||
@Schema(description = "外包合同总额")
|
|
||||||
@ExcelProperty("外包合同总额")
|
|
||||||
private BigDecimal amount;
|
|
||||||
|
|
||||||
@Schema(description = "专业")
|
@Schema(description = "专业")
|
||||||
@ExcelProperty(value = "专业", converter = DictConvert.class)
|
@ExcelProperty(value = "专业", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
|
@DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
|
||||||
@ -64,13 +63,29 @@ public class OutsContractRespVO {
|
|||||||
@ExcelProperty("签订时间")
|
@ExcelProperty("签订时间")
|
||||||
private LocalDateTime signingTime;
|
private LocalDateTime signingTime;
|
||||||
|
|
||||||
@Schema(description = "结算数")
|
|
||||||
@ExcelProperty("结算数")
|
|
||||||
private BigDecimal settlementAmount;
|
|
||||||
|
|
||||||
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
|
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
|
||||||
@ExcelProperty("合同文件url")
|
@ExcelProperty("合同文件url")
|
||||||
private String contractFileUrl;
|
private String contractFileUrl;
|
||||||
|
|
||||||
|
|
||||||
|
@Schema(description = "外包单位")
|
||||||
|
@ExcelProperty("外包单位")
|
||||||
|
private String outsCompany;
|
||||||
|
|
||||||
|
@Schema(description = "外包合同金额")
|
||||||
|
@ExcelProperty("外包合同金额")
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
@Schema(description = "外包合同编号")
|
||||||
|
@ExcelProperty("外包合同编号")
|
||||||
|
private Integer code;
|
||||||
|
|
||||||
|
@Schema(description = "最终外包金额")
|
||||||
|
@ExcelProperty("最终外包金额")
|
||||||
|
private BigDecimal finalAmount;
|
||||||
|
|
||||||
|
@Schema(description = "最后编辑人")
|
||||||
|
@ExcelProperty("最后编辑人")
|
||||||
|
private String finalEditor;
|
||||||
|
|
||||||
}
|
}
|
@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
|
|||||||
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.cms.enums.DictTypeConstants;
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -16,12 +15,18 @@ import java.time.LocalDateTime;
|
|||||||
public class OutsContractSaveReqVO {
|
public class OutsContractSaveReqVO {
|
||||||
|
|
||||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
|
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2034")
|
||||||
|
@ExcelProperty("主键")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
|
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27415")
|
||||||
@NotNull(message = "项目id不能为空")
|
@ExcelProperty("项目id")
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
|
||||||
|
@Schema(description = "主合同id", example = "19816")
|
||||||
|
@ExcelProperty("主合同id")
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "合同名称", example = "张三")
|
@Schema(description = "合同名称", example = "张三")
|
||||||
@ExcelProperty("合同名称")
|
@ExcelProperty("合同名称")
|
||||||
@ -31,38 +36,22 @@ public class OutsContractSaveReqVO {
|
|||||||
@ExcelProperty("主控部门")
|
@ExcelProperty("主控部门")
|
||||||
private String trackingDep;
|
private String trackingDep;
|
||||||
|
|
||||||
@Schema(description = "项目经理", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("项目经理")
|
@ExcelProperty("项目负责人")
|
||||||
private String projectManager;
|
private String projectManager;
|
||||||
|
|
||||||
@Schema(description = "签订合同总额")
|
@Schema(description = "签订合同总额")
|
||||||
@ExcelProperty("签订合同总额")
|
@ExcelProperty("签订合同总额")
|
||||||
private BigDecimal amount;
|
|
||||||
|
|
||||||
@Schema(description = "外包合同编号")
|
|
||||||
@ExcelProperty("编号")
|
|
||||||
private String code;
|
|
||||||
|
|
||||||
@Schema(description = "外包单位")
|
|
||||||
@ExcelProperty("外包单位")
|
|
||||||
private String outsCompany;
|
|
||||||
|
|
||||||
@Schema(description = "主合同id", example = "19816")
|
|
||||||
@ExcelProperty("主合同id")
|
|
||||||
private Long contractId;
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "外包合同类型", example = "2")
|
|
||||||
@ExcelProperty(value = "外包合同类型", converter = DictConvert.class)
|
|
||||||
@DictFormat(DictTypeConstants.COUNT_TYPE)
|
|
||||||
private String countType;
|
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "外包合同金额")
|
|
||||||
@ExcelProperty("外包合同金额")
|
|
||||||
private BigDecimal outsAmount;
|
private BigDecimal outsAmount;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Schema(description = "类型", example = "2")
|
||||||
|
@ExcelProperty(value = "类型", converter = DictConvert.class)
|
||||||
|
@DictFormat(DictTypeConstants.CONTRACT_STATUS)
|
||||||
|
private String countType;
|
||||||
|
|
||||||
@Schema(description = "专业")
|
@Schema(description = "专业")
|
||||||
@ExcelProperty(value = "专业", converter = DictConvert.class)
|
@ExcelProperty(value = "专业", converter = DictConvert.class)
|
||||||
@DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
|
@DictFormat(DictTypeConstants.OUTS_CONTRACT_MAJOR)
|
||||||
@ -72,12 +61,29 @@ public class OutsContractSaveReqVO {
|
|||||||
@ExcelProperty("签订时间")
|
@ExcelProperty("签订时间")
|
||||||
private LocalDateTime signingTime;
|
private LocalDateTime signingTime;
|
||||||
|
|
||||||
@Schema(description = "结算数")
|
|
||||||
@ExcelProperty("结算数")
|
|
||||||
private BigDecimal settlementAmount;
|
|
||||||
|
|
||||||
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
|
@Schema(description = "合同文件url", example = "https://www.iocoder.cn")
|
||||||
@ExcelProperty("合同文件url")
|
@ExcelProperty("合同文件url")
|
||||||
private String contractFileUrl;
|
private String contractFileUrl;
|
||||||
|
|
||||||
|
|
||||||
|
@Schema(description = "外包单位")
|
||||||
|
@ExcelProperty("外包单位")
|
||||||
|
private String outsCompany;
|
||||||
|
|
||||||
|
@Schema(description = "外包合同金额")
|
||||||
|
@ExcelProperty("外包合同金额")
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
@Schema(description = "外包合同编号")
|
||||||
|
@ExcelProperty("外包合同编号")
|
||||||
|
private Integer code;
|
||||||
|
|
||||||
|
@Schema(description = "最终外包金额")
|
||||||
|
@ExcelProperty("最终外包金额")
|
||||||
|
private BigDecimal finalAmount;
|
||||||
|
|
||||||
|
@Schema(description = "最后编辑人")
|
||||||
|
@ExcelProperty("最后编辑人")
|
||||||
|
private String finalEditor;
|
||||||
|
|
||||||
}
|
}
|
@ -1,6 +1,5 @@
|
|||||||
package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
|
package cn.iocoder.yudao.module.cms.dal.dataobject.contract;
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.pms.enums.DictTypeConstants;
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@ -10,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
|
|||||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 合同 DO
|
* 合同管理 DO
|
||||||
*
|
*
|
||||||
* @author 管理员
|
* @author 管理员
|
||||||
*/
|
*/
|
||||||
@ -33,14 +32,16 @@ public class ContractDO extends BaseDO {
|
|||||||
* 项目id
|
* 项目id
|
||||||
*/
|
*/
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
/**
|
||||||
|
* 外部合同id
|
||||||
|
*/
|
||||||
|
private Long extContractId;
|
||||||
/**
|
/**
|
||||||
* 合同名称
|
* 合同名称
|
||||||
*/
|
*/
|
||||||
private String name;
|
private String name;
|
||||||
/**
|
/**
|
||||||
* 合同类型
|
* 合同类型
|
||||||
*
|
|
||||||
* 枚举 枚举 {@link DictTypeConstants}
|
|
||||||
*/
|
*/
|
||||||
private String type;
|
private String type;
|
||||||
/**
|
/**
|
||||||
@ -65,12 +66,22 @@ public class ContractDO extends BaseDO {
|
|||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
/**
|
/**
|
||||||
* 合同状态
|
* 合同状态
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String status;
|
private String status;
|
||||||
|
/**
|
||||||
|
* 签订合同总额
|
||||||
|
*/
|
||||||
|
private BigDecimal amount;
|
||||||
/**
|
/**
|
||||||
* 计费方式
|
* 计费方式
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String countType;
|
private String countType;
|
||||||
|
/**
|
||||||
|
* 暂定结算数
|
||||||
|
*/
|
||||||
|
private BigDecimal provisionalSettlement;
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
@ -90,7 +101,7 @@ public class ContractDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
* 优惠
|
* 优惠
|
||||||
*/
|
*/
|
||||||
private String discount;
|
private BigDecimal discount;
|
||||||
/**
|
/**
|
||||||
* 是否联合体
|
* 是否联合体
|
||||||
*/
|
*/
|
||||||
@ -102,7 +113,7 @@ public class ContractDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
* 占主合同比例
|
* 占主合同比例
|
||||||
*/
|
*/
|
||||||
private String extProportion;
|
private BigDecimal extProportion;
|
||||||
/**
|
/**
|
||||||
* 审定金额
|
* 审定金额
|
||||||
*/
|
*/
|
||||||
@ -112,28 +123,8 @@ public class ContractDO extends BaseDO {
|
|||||||
*/
|
*/
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
/**
|
/**
|
||||||
* 签订合同总额
|
* 最后编辑人
|
||||||
*/
|
*/
|
||||||
private BigDecimal amount;
|
private String finalEditor;
|
||||||
/**
|
|
||||||
* 前期费
|
|
||||||
*/
|
|
||||||
private BigDecimal preAmount;
|
|
||||||
/**
|
|
||||||
* 设计费
|
|
||||||
*/
|
|
||||||
private BigDecimal designAmount;
|
|
||||||
/**
|
|
||||||
* 勘测费
|
|
||||||
*/
|
|
||||||
private BigDecimal surveyFees;
|
|
||||||
/**
|
|
||||||
* 测量费
|
|
||||||
*/
|
|
||||||
private BigDecimal measurementFee;
|
|
||||||
/**
|
|
||||||
* 其他费
|
|
||||||
*/
|
|
||||||
private BigDecimal otherFee;
|
|
||||||
|
|
||||||
}
|
}
|
@ -1,12 +1,15 @@
|
|||||||
package cn.iocoder.yudao.module.cms.dal.dataobject.extcontract;
|
package cn.iocoder.yudao.module.cms.dal.dataobject.extcontract;
|
||||||
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 外部合同 DO
|
* 外部合同管理 DO
|
||||||
*
|
*
|
||||||
* @author 管理员
|
* @author 管理员
|
||||||
*/
|
*/
|
||||||
@ -25,6 +28,10 @@ public class ExtContractDO extends BaseDO {
|
|||||||
*/
|
*/
|
||||||
@TableId
|
@TableId
|
||||||
private Long id;
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 合同id
|
||||||
|
*/
|
||||||
|
private Long contractId;
|
||||||
/**
|
/**
|
||||||
* 项目id
|
* 项目id
|
||||||
*/
|
*/
|
||||||
@ -35,12 +42,9 @@ public class ExtContractDO extends BaseDO {
|
|||||||
private String name;
|
private String name;
|
||||||
/**
|
/**
|
||||||
* 合同类型
|
* 合同类型
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String type;
|
private String type;
|
||||||
/**
|
|
||||||
* 客户公司id
|
|
||||||
*/
|
|
||||||
private Long customerCompanyId;
|
|
||||||
/**
|
/**
|
||||||
* 合同进展
|
* 合同进展
|
||||||
*/
|
*/
|
||||||
@ -59,10 +63,11 @@ public class ExtContractDO extends BaseDO {
|
|||||||
private LocalDateTime archiveTime;
|
private LocalDateTime archiveTime;
|
||||||
/**
|
/**
|
||||||
* 状态
|
* 状态
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String status;
|
private String status;
|
||||||
/**
|
/**
|
||||||
* 合同金额
|
* 合同总金额
|
||||||
*/
|
*/
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
/**
|
/**
|
||||||
@ -84,9 +89,10 @@ public class ExtContractDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
* 其他费
|
* 其他费
|
||||||
*/
|
*/
|
||||||
private String otherFee;
|
private BigDecimal otherFee;
|
||||||
/**
|
/**
|
||||||
* 计费方式
|
* 计费方式
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String countType;
|
private String countType;
|
||||||
/**
|
/**
|
||||||
@ -103,16 +109,18 @@ public class ExtContractDO extends BaseDO {
|
|||||||
private BigDecimal constructionCost;
|
private BigDecimal constructionCost;
|
||||||
/**
|
/**
|
||||||
* 资金来源
|
* 资金来源
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String source;
|
private String source;
|
||||||
/**
|
/**
|
||||||
* 收费标准
|
* 收费标准
|
||||||
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
*/
|
*/
|
||||||
private String chargingStandard;
|
private String chargingStandard;
|
||||||
/**
|
/**
|
||||||
* 优惠
|
* 优惠
|
||||||
*/
|
*/
|
||||||
private String discount;
|
private BigDecimal discount;
|
||||||
/**
|
/**
|
||||||
* 是否联合体
|
* 是否联合体
|
||||||
*/
|
*/
|
||||||
@ -121,7 +129,10 @@ public class ExtContractDO extends BaseDO {
|
|||||||
* 联合体单位
|
* 联合体单位
|
||||||
*/
|
*/
|
||||||
private String consortiumCompany;
|
private String consortiumCompany;
|
||||||
|
/**
|
||||||
|
* 合同商议提示
|
||||||
|
*/
|
||||||
|
private LocalDateTime reminderTime;
|
||||||
/**
|
/**
|
||||||
* 审定金额
|
* 审定金额
|
||||||
*/
|
*/
|
||||||
@ -131,13 +142,8 @@ public class ExtContractDO extends BaseDO {
|
|||||||
*/
|
*/
|
||||||
private String reviewFileUrl;
|
private String reviewFileUrl;
|
||||||
/**
|
/**
|
||||||
* 合同id
|
* 最后编辑人
|
||||||
*/
|
*/
|
||||||
private Long contractId;
|
private String finalEditor;
|
||||||
|
|
||||||
/**
|
|
||||||
* 分包合同提示时间
|
|
||||||
*/
|
|
||||||
private LocalDateTime reminderTime;
|
|
||||||
|
|
||||||
}
|
}
|
@ -1,13 +1,12 @@
|
|||||||
package cn.iocoder.yudao.module.cms.dal.dataobject.outscontract;
|
package cn.iocoder.yudao.module.cms.dal.dataobject.outscontract;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
|
||||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 外包合同 DO
|
* 外包合同 DO
|
||||||
@ -33,45 +32,47 @@ public class OutsContractDO extends BaseDO {
|
|||||||
* 项目id
|
* 项目id
|
||||||
*/
|
*/
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
/**
|
|
||||||
* 合同名称
|
|
||||||
*/
|
|
||||||
private String name;
|
|
||||||
/**
|
/**
|
||||||
* 主合同id
|
* 主合同id
|
||||||
*/
|
*/
|
||||||
private Long contractId;
|
private Long contractId;
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}
|
||||||
* 枚举 //// TODO 搞成枚举
|
|
||||||
*/
|
*/
|
||||||
private String countType;
|
private String countType;
|
||||||
/**
|
|
||||||
* 外包合同金额
|
|
||||||
*/
|
|
||||||
private BigDecimal amount;
|
|
||||||
/**
|
|
||||||
* 编号
|
|
||||||
*/
|
|
||||||
private String code;
|
|
||||||
/**
|
/**
|
||||||
* 专业
|
* 专业
|
||||||
*
|
* 枚举 {@link cn.iocoder.yudao.module.cms.enums.DictTypeConstants}3
|
||||||
* 枚举 // TODO 搞成枚举
|
|
||||||
*/
|
*/
|
||||||
private String major;
|
private String major;
|
||||||
/**
|
/**
|
||||||
* 签订时间
|
* 签订时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime signingTime;
|
private LocalDateTime signingTime;
|
||||||
/**
|
|
||||||
* 结算数
|
|
||||||
*/
|
|
||||||
private BigDecimal settlementAmount;
|
|
||||||
/**
|
/**
|
||||||
* 合同文件url
|
* 合同文件url
|
||||||
*/
|
*/
|
||||||
private String contractFileUrl;
|
private String contractFileUrl;
|
||||||
|
/**
|
||||||
|
* 外包单位
|
||||||
|
*/
|
||||||
|
private String outsCompany;
|
||||||
|
/**
|
||||||
|
* 外包合同金额
|
||||||
|
*/
|
||||||
|
private BigDecimal amount;
|
||||||
|
/**
|
||||||
|
* 外包合同编号
|
||||||
|
*/
|
||||||
|
private Integer code;
|
||||||
|
/**
|
||||||
|
* 最终外包金额
|
||||||
|
*/
|
||||||
|
private BigDecimal finalAmount;
|
||||||
|
/**
|
||||||
|
* 最后编辑人
|
||||||
|
*/
|
||||||
|
private String finalEditor;
|
||||||
|
|
||||||
}
|
}
|
@ -19,7 +19,6 @@ public interface ExtContractMapper extends BaseMapperX<ExtContractDO> {
|
|||||||
return selectPage(reqVO, new LambdaQueryWrapperX<ExtContractDO>()
|
return selectPage(reqVO, new LambdaQueryWrapperX<ExtContractDO>()
|
||||||
.likeIfPresent(ExtContractDO::getName, reqVO.getName())
|
.likeIfPresent(ExtContractDO::getName, reqVO.getName())
|
||||||
.eqIfPresent(ExtContractDO::getType, reqVO.getType())
|
.eqIfPresent(ExtContractDO::getType, reqVO.getType())
|
||||||
.eqIfPresent(ExtContractDO::getCustomerCompanyId, reqVO.getCustomerCompanyId())
|
|
||||||
.eqIfPresent(ExtContractDO::getProgress, reqVO.getProgress())
|
.eqIfPresent(ExtContractDO::getProgress, reqVO.getProgress())
|
||||||
.eqIfPresent(ExtContractDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(ExtContractDO::getStatus, reqVO.getStatus())
|
||||||
.eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()));
|
.eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()));
|
||||||
|
@ -18,14 +18,12 @@ public interface OutsContractMapper extends BaseMapperX<OutsContractDO> {
|
|||||||
default PageResult<OutsContractDO> selectPage(OutsContractPageReqVO reqVO) {
|
default PageResult<OutsContractDO> selectPage(OutsContractPageReqVO reqVO) {
|
||||||
return selectPage(reqVO, new LambdaQueryWrapperX<OutsContractDO>()
|
return selectPage(reqVO, new LambdaQueryWrapperX<OutsContractDO>()
|
||||||
.eqIfPresent(OutsContractDO::getProjectId, reqVO.getProjectId())
|
.eqIfPresent(OutsContractDO::getProjectId, reqVO.getProjectId())
|
||||||
.likeIfPresent(OutsContractDO::getName, reqVO.getName())
|
|
||||||
.eqIfPresent(OutsContractDO::getContractId, reqVO.getContractId())
|
.eqIfPresent(OutsContractDO::getContractId, reqVO.getContractId())
|
||||||
.eqIfPresent(OutsContractDO::getCountType, reqVO.getCountType())
|
.eqIfPresent(OutsContractDO::getCountType, reqVO.getCountType())
|
||||||
.eqIfPresent(OutsContractDO::getAmount, reqVO.getAmount())
|
.eqIfPresent(OutsContractDO::getAmount, reqVO.getAmount())
|
||||||
.eqIfPresent(OutsContractDO::getCode, reqVO.getCode())
|
.eqIfPresent(OutsContractDO::getCode, reqVO.getCode())
|
||||||
.eqIfPresent(OutsContractDO::getMajor, reqVO.getMajor())
|
.eqIfPresent(OutsContractDO::getMajor, reqVO.getMajor())
|
||||||
.betweenIfPresent(OutsContractDO::getSigningTime, reqVO.getSigningTime())
|
.betweenIfPresent(OutsContractDO::getSigningTime, reqVO.getSigningTime())
|
||||||
.eqIfPresent(OutsContractDO::getSettlementAmount, reqVO.getSettlementAmount())
|
|
||||||
.eqIfPresent(OutsContractDO::getContractFileUrl, reqVO.getContractFileUrl())
|
.eqIfPresent(OutsContractDO::getContractFileUrl, reqVO.getContractFileUrl())
|
||||||
.orderByDesc(OutsContractDO::getId));
|
.orderByDesc(OutsContractDO::getId));
|
||||||
}
|
}
|
||||||
|
@ -215,7 +215,7 @@ public class ContractServiceImpl implements ContractService {
|
|||||||
// 3.项目经理 pms_project找到的是id 需要联表 √
|
// 3.项目经理 pms_project找到的是id 需要联表 √
|
||||||
// 4.出图公司 pms_project 直接 √
|
// 4.出图公司 pms_project 直接 √
|
||||||
// 5.预计合同金额 pms_project 直接 √
|
// 5.预计合同金额 pms_project 直接 √
|
||||||
// 6.分包合同商议提示 √
|
// 6.合同商议提示 √ 外部合同表里
|
||||||
// 7.暂定结算数 √
|
// 7.暂定结算数 √
|
||||||
|
|
||||||
ProjectRespDTO project = projectApi.getProject(projectId);
|
ProjectRespDTO project = projectApi.getProject(projectId);
|
||||||
|
@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractProcessI
|
|||||||
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO;
|
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractPageReqVO;
|
||||||
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO;
|
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractRespVO;
|
||||||
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO;
|
import cn.iocoder.yudao.module.cms.controller.admin.extContract.vo.ExtContractSaveReqVO;
|
||||||
import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO;
|
|
||||||
import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO;
|
|
||||||
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDO;
|
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDO;
|
||||||
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontracthistory.ExtContractHistoryDO;
|
import cn.iocoder.yudao.module.cms.dal.dataobject.extcontracthistory.ExtContractHistoryDO;
|
||||||
import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
|
import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper;
|
||||||
@ -130,10 +128,11 @@ public class ExtContractServiceImpl implements ExtContractService {
|
|||||||
if (!projectDetail.getProjectManagerName().equals(projectManager)){
|
if (!projectDetail.getProjectManagerName().equals(projectManager)){
|
||||||
throw exception(PARAM_ERROR);
|
throw exception(PARAM_ERROR);
|
||||||
}
|
}
|
||||||
String name = customerCompanyMapper.selectById(createReqVO.getCustomerCompanyId()).getName();
|
// String name = customerCompanyMapper.selectById(createReqVO.getCustomerCompanyId()).getName();
|
||||||
if (!name.equals(customerCompanyName)){
|
// if (!name.equals(customerCompanyName)){
|
||||||
throw exception(PARAM_ERROR);
|
// throw exception(PARAM_ERROR);
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (!Objects.equals(amount, getContractAmount(createReqVO))){
|
if (!Objects.equals(amount, getContractAmount(createReqVO))){
|
||||||
throw exception(PARAM_ERROR);
|
throw exception(PARAM_ERROR);
|
||||||
}
|
}
|
||||||
@ -243,7 +242,7 @@ public class ExtContractServiceImpl implements ExtContractService {
|
|||||||
throw exception(PROJECT_NOT_EXISTS);
|
throw exception(PROJECT_NOT_EXISTS);
|
||||||
}
|
}
|
||||||
|
|
||||||
Long customerCompanyId = extContractDO.getCustomerCompanyId();
|
//Long customerCompanyId = extContractDO.getCustomerCompanyId();
|
||||||
ExtContractRespVO extContractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class);
|
ExtContractRespVO extContractRespVO = BeanUtils.toBean(extContractDO, ExtContractRespVO.class);
|
||||||
|
|
||||||
|
|
||||||
@ -255,9 +254,9 @@ public class ExtContractServiceImpl implements ExtContractService {
|
|||||||
extContractRespVO.setProjectManager(projectDetail.getProjectManagerName());
|
extContractRespVO.setProjectManager(projectDetail.getProjectManagerName());
|
||||||
|
|
||||||
//用客户公司id查询
|
//用客户公司id查询
|
||||||
CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
|
//CustomerCompanyDO customerCompanyDO = customerCompanyMapper.selectById(customerCompanyId);
|
||||||
String name = customerCompanyDO.getName();
|
//String name = customerCompanyDO.getName();
|
||||||
extContractRespVO.setCustomerCompanyName(name);
|
//extContractRespVO.setCustomerCompanyName(name);
|
||||||
|
|
||||||
|
|
||||||
//合同总金额
|
//合同总金额
|
||||||
@ -307,8 +306,9 @@ public class ExtContractServiceImpl implements ExtContractService {
|
|||||||
BigDecimal designFee = new BigDecimal(String.valueOf(extContract.getDesignFee()));
|
BigDecimal designFee = new BigDecimal(String.valueOf(extContract.getDesignFee()));
|
||||||
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContract.getSurveyFees()));
|
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContract.getSurveyFees()));
|
||||||
BigDecimal testingFee = new BigDecimal(String.valueOf(extContract.getTestingFee()));
|
BigDecimal testingFee = new BigDecimal(String.valueOf(extContract.getTestingFee()));
|
||||||
BigDecimal other = new BigDecimal(extContract.getOtherFee());
|
//BigDecimal other = new BigDecimal(extContract.getOtherFee());
|
||||||
return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
|
//return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -318,8 +318,8 @@ public class ExtContractServiceImpl implements ExtContractService {
|
|||||||
BigDecimal designFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getDesignFee()));
|
BigDecimal designFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getDesignFee()));
|
||||||
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContractSaveReqVO.getSurveyFees()));
|
BigDecimal surveyFees = new BigDecimal(String.valueOf(extContractSaveReqVO.getSurveyFees()));
|
||||||
BigDecimal testingFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getTestingFee()));
|
BigDecimal testingFee = new BigDecimal(String.valueOf(extContractSaveReqVO.getTestingFee()));
|
||||||
BigDecimal other = new BigDecimal(extContractSaveReqVO.getOtherFee());
|
//BigDecimal other = new BigDecimal(extContractSaveReqVO.getOtherFee());
|
||||||
return preAmount.add(designFee).add(surveyFees).add(testingFee).add(other);
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -24,4 +24,9 @@ public interface ErrorCodeConstants {
|
|||||||
ErrorCode RECEIVABLES_NOT_EXISTS = new ErrorCode(1_024_000_000, "应收款管理不存在");
|
ErrorCode RECEIVABLES_NOT_EXISTS = new ErrorCode(1_024_000_000, "应收款管理不存在");
|
||||||
// ========== 应收款管理历史记录 1_024_000_000 ==========
|
// ========== 应收款管理历史记录 1_024_000_000 ==========
|
||||||
ErrorCode RECEIVABLES_HISTORY_NOT_EXISTS = new ErrorCode(1_024_000_000, "应收款管理历史记录不存在");
|
ErrorCode RECEIVABLES_HISTORY_NOT_EXISTS = new ErrorCode(1_024_000_000, "应收款管理历史记录不存在");
|
||||||
|
|
||||||
|
// ========== 项目进度管理 1_024_000_000 ==========
|
||||||
|
ErrorCode PROJECT_SCHEDULE_NOT_EXISTS = new ErrorCode(1_025_000_000, "项目进度管理不存在");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="cn.iocoder.yudao.module.pms.dal.mysql.projectschedule.ProjectScheduleMapper">
|
||||||
|
|
||||||
|
<!--
|
||||||
|
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
|
||||||
|
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
|
||||||
|
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
|
||||||
|
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
|
||||||
|
-->
|
||||||
|
|
||||||
|
</mapper>
|
@ -4,15 +4,22 @@ import request from '@/config/axios'
|
|||||||
export interface OutsContractVO {
|
export interface OutsContractVO {
|
||||||
id: number // 主键
|
id: number // 主键
|
||||||
projectId: number // 项目id
|
projectId: number // 项目id
|
||||||
name: string // 合同名称
|
|
||||||
contractId: number // 主合同id
|
contractId: number // 主合同id
|
||||||
countType: string // 类型
|
countType: string // 类型
|
||||||
amount: number // 合同金额
|
|
||||||
code: string // 编号
|
|
||||||
major: string // 专业
|
major: string // 专业
|
||||||
signingTime: Date // 签订时间
|
signingTime: Date // 签订时间
|
||||||
settlementAmount: number // 结算数
|
|
||||||
contractFileUrl: string // 合同文件url
|
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
|
// 外包合同 API
|
@ -10,9 +10,6 @@
|
|||||||
<el-form-item label="项目id" prop="projectId">
|
<el-form-item label="项目id" prop="projectId">
|
||||||
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
|
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
|
||||||
</el-form-item>
|
</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-form-item label="主合同id" prop="contractId">
|
||||||
<el-input v-model="formData.contractId" placeholder="请输入主合同id" />
|
<el-input v-model="formData.contractId" placeholder="请输入主合同id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -26,12 +23,6 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="专业" prop="major">
|
||||||
<el-select v-model="formData.major" placeholder="请选择专业">
|
<el-select v-model="formData.major" placeholder="请选择专业">
|
||||||
<el-option
|
<el-option
|
||||||
@ -50,12 +41,54 @@
|
|||||||
placeholder="选择签订时间"
|
placeholder="选择签订时间"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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">
|
<el-form-item label="合同文件url" prop="contractFileUrl">
|
||||||
<UploadFile v-model="formData.contractFileUrl" />
|
<UploadFile v-model="formData.contractFileUrl" />
|
||||||
</el-form-item>
|
</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>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||||
@ -80,18 +113,29 @@ const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
|||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined,
|
id: undefined,
|
||||||
projectId: undefined,
|
projectId: undefined,
|
||||||
name: undefined,
|
|
||||||
contractId: undefined,
|
contractId: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
amount: undefined,
|
|
||||||
code: undefined,
|
|
||||||
major: undefined,
|
major: undefined,
|
||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
settlementAmount: undefined,
|
|
||||||
contractFileUrl: 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({
|
const formRules = reactive({
|
||||||
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
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
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
@ -142,15 +186,22 @@ const resetForm = () => {
|
|||||||
formData.value = {
|
formData.value = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
projectId: undefined,
|
projectId: undefined,
|
||||||
name: undefined,
|
|
||||||
contractId: undefined,
|
contractId: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
amount: undefined,
|
|
||||||
code: undefined,
|
|
||||||
major: undefined,
|
major: undefined,
|
||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
settlementAmount: undefined,
|
|
||||||
contractFileUrl: 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()
|
formRef.value?.resetFields()
|
||||||
}
|
}
|
@ -17,15 +17,6 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item label="主合同id" prop="contractId">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.contractId"
|
v-model="queryParams.contractId"
|
||||||
@ -50,24 +41,6 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="专业" prop="major">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.major"
|
v-model="queryParams.major"
|
||||||
@ -94,15 +67,6 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item label="创建时间" prop="createTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="queryParams.createTime"
|
v-model="queryParams.createTime"
|
||||||
@ -114,6 +78,51 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item>
|
||||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
<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 @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 v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="主键" align="center" prop="id" />
|
<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="projectId" />
|
||||||
<el-table-column label="合同名称" align="center" prop="name" />
|
|
||||||
<el-table-column label="主合同id" align="center" prop="contractId" />
|
<el-table-column label="主合同id" align="center" prop="contractId" />
|
||||||
<el-table-column label="类型" align="center" prop="countType">
|
<el-table-column label="类型" align="center" prop="countType">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.CONTRACT_BILLING_TYPE" :value="scope.row.countType" />
|
<dict-tag :type="DICT_TYPE.CONTRACT_BILLING_TYPE" :value="scope.row.countType" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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">
|
<el-table-column label="专业" align="center" prop="major">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.MAJOR" :value="scope.row.major" />
|
<dict-tag :type="DICT_TYPE.MAJOR" :value="scope.row.major" />
|
||||||
@ -164,8 +170,8 @@
|
|||||||
:formatter="dateFormatter"
|
:formatter="dateFormatter"
|
||||||
width="180px"
|
width="180px"
|
||||||
/>
|
/>
|
||||||
<el-table-column label="结算数" align="center" prop="settlementAmount" />
|
|
||||||
<el-table-column label="合同文件url" align="center" prop="contractFileUrl" />
|
<el-table-column label="合同文件url" align="center" prop="contractFileUrl" />
|
||||||
|
<el-table-column label="创建者" align="center" prop="creator" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="创建时间"
|
label="创建时间"
|
||||||
align="center"
|
align="center"
|
||||||
@ -173,6 +179,21 @@
|
|||||||
:formatter="dateFormatter"
|
:formatter="dateFormatter"
|
||||||
width="180px"
|
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">
|
<el-table-column label="操作" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@ -227,16 +248,17 @@ const queryParams = reactive({
|
|||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
projectId: undefined,
|
projectId: undefined,
|
||||||
name: undefined,
|
|
||||||
contractId: undefined,
|
contractId: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
amount: undefined,
|
|
||||||
code: undefined,
|
|
||||||
major: undefined,
|
major: undefined,
|
||||||
signingTime: [],
|
signingTime: [],
|
||||||
settlementAmount: undefined,
|
|
||||||
contractFileUrl: undefined,
|
contractFileUrl: undefined,
|
||||||
createTime: [],
|
createTime: [],
|
||||||
|
outsCompany: undefined,
|
||||||
|
amount: undefined,
|
||||||
|
code: undefined,
|
||||||
|
finalAmount: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
})
|
})
|
||||||
const queryFormRef = ref() // 搜索的表单
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
const exportLoading = ref(false) // 导出的加载中
|
@ -1,7 +1,10 @@
|
|||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// 合同 VO
|
// 合同管理 VO
|
||||||
export interface ContractVO {
|
export interface ContractVO {
|
||||||
|
id: number // 主键
|
||||||
|
projectId: number // 项目id
|
||||||
|
extContractId: number // 外部合同id
|
||||||
name: string // 合同名称
|
name: string // 合同名称
|
||||||
type: string // 合同类型
|
type: string // 合同类型
|
||||||
progress: string // 合同进展
|
progress: string // 合同进展
|
||||||
@ -10,59 +13,56 @@ export interface ContractVO {
|
|||||||
signingTime: Date // 签订时间
|
signingTime: Date // 签订时间
|
||||||
archiveTime: Date // 归档时间
|
archiveTime: Date // 归档时间
|
||||||
status: string // 合同状态
|
status: string // 合同状态
|
||||||
|
amount: number // 签订合同总额
|
||||||
countType: string // 计费方式
|
countType: string // 计费方式
|
||||||
|
provisionalSettlement: number // 暂定结算数
|
||||||
remark: string // 备注
|
remark: string // 备注
|
||||||
contractFileUrl: string // 合同url
|
contractFileUrl: string // 合同url
|
||||||
constructionCost: number // 建安费
|
constructionCost: number // 建安费
|
||||||
source: string // 资金来源
|
source: string // 资金来源
|
||||||
discount: string // 优惠
|
discount: number // 优惠
|
||||||
consortium: boolean // 是否联合体
|
consortium: boolean // 是否联合体
|
||||||
consortiumCompany: string // 联合体单位
|
consortiumCompany: string // 联合体单位
|
||||||
extProportion: string // 占主合同比例
|
extProportion: number // 占主合同比例
|
||||||
approvedAmount: number // 审定金额
|
approvedAmount: number // 审定金额
|
||||||
reviewFileUrl: string // 审核文件url
|
reviewFileUrl: string // 审核文件url
|
||||||
|
finalEditor: string // 最后编辑人
|
||||||
creator: string // 创建者
|
creator: string // 创建者
|
||||||
createTime: Date // 创建时间
|
createTime: Date // 创建时间
|
||||||
updater: string // 更新者
|
updater: string // 更新者
|
||||||
updateTime: Date // 更新时间
|
updateTime: Date // 更新时间
|
||||||
deleted: boolean // 是否删除
|
deleted: boolean // 是否删除
|
||||||
tenantId: number // 租户编号
|
tenantId: number // 租户编号
|
||||||
amount: number // 签订合同总额
|
|
||||||
preAmount: number // 前期费
|
|
||||||
designAmount: number // 设计费
|
|
||||||
surveyFees: number // 勘测费
|
|
||||||
measurementFee: number // 测量费
|
|
||||||
otherFee: number // 其他费
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 合同 API
|
// 合同管理 API
|
||||||
export const ContractApi = {
|
export const ContractApi = {
|
||||||
// 查询合同分页
|
// 查询合同管理分页
|
||||||
getContractPage: async (params: any) => {
|
getContractPage: async (params: any) => {
|
||||||
return await request.get({ url: `/cms/contract/page`, params })
|
return await request.get({ url: `/cms/contract/page`, params })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 查询合同详情
|
// 查询合同管理详情
|
||||||
getContract: async (id: number) => {
|
getContract: async (id: number) => {
|
||||||
return await request.get({ url: `/cms/contract/get?id=` + id })
|
return await request.get({ url: `/cms/contract/get?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 新增合同
|
// 新增合同管理
|
||||||
createContract: async (data: ContractVO) => {
|
createContract: async (data: ContractVO) => {
|
||||||
return await request.post({ url: `/cms/contract/create`, data })
|
return await request.post({ url: `/cms/contract/create`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 修改合同
|
// 修改合同管理
|
||||||
updateContract: async (data: ContractVO) => {
|
updateContract: async (data: ContractVO) => {
|
||||||
return await request.put({ url: `/cms/contract/update`, data })
|
return await request.put({ url: `/cms/contract/update`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 删除合同
|
// 删除合同管理
|
||||||
deleteContract: async (id: number) => {
|
deleteContract: async (id: number) => {
|
||||||
return await request.delete({ url: `/cms/contract/delete?id=` + id })
|
return await request.delete({ url: `/cms/contract/delete?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 导出合同 Excel
|
// 导出合同管理 Excel
|
||||||
exportContract: async (params) => {
|
exportContract: async (params) => {
|
||||||
return await request.download({ url: `/cms/contract/export-excel`, params })
|
return await request.download({ url: `/cms/contract/export-excel`, params })
|
||||||
},
|
},
|
||||||
|
@ -7,6 +7,12 @@
|
|||||||
label-width="100px"
|
label-width="100px"
|
||||||
v-loading="formLoading"
|
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-form-item label="合同名称" prop="name">
|
||||||
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -60,6 +66,9 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="计费方式" prop="countType">
|
||||||
<el-select v-model="formData.countType" placeholder="请选择计费方式">
|
<el-select v-model="formData.countType" placeholder="请选择计费方式">
|
||||||
<el-option
|
<el-option
|
||||||
@ -70,6 +79,9 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="formData.remark" placeholder="请输入备注" />
|
<el-input v-model="formData.remark" placeholder="请输入备注" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -81,12 +93,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="资金来源" prop="source">
|
<el-form-item label="资金来源" prop="source">
|
||||||
<el-select v-model="formData.source" placeholder="请选择资金来源">
|
<el-select v-model="formData.source" placeholder="请选择资金来源">
|
||||||
<el-option
|
<el-option label="请选择字典生成" value="" />
|
||||||
v-for="dict in getStrDictOptions(DICT_TYPE.FUNDS_SOURCE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="优惠" prop="discount">
|
<el-form-item label="优惠" prop="discount">
|
||||||
@ -109,6 +116,9 @@
|
|||||||
<el-form-item label="审核文件url" prop="reviewFileUrl">
|
<el-form-item label="审核文件url" prop="reviewFileUrl">
|
||||||
<UploadFile v-model="formData.reviewFileUrl" />
|
<UploadFile v-model="formData.reviewFileUrl" />
|
||||||
</el-form-item>
|
</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-form-item label="创建者" prop="creator">
|
||||||
<el-input v-model="formData.creator" placeholder="请输入创建者" />
|
<el-input v-model="formData.creator" placeholder="请输入创建者" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -139,24 +149,6 @@
|
|||||||
<el-form-item label="租户编号" prop="tenantId">
|
<el-form-item label="租户编号" prop="tenantId">
|
||||||
<el-input v-model="formData.tenantId" placeholder="请输入租户编号" />
|
<el-input v-model="formData.tenantId" placeholder="请输入租户编号" />
|
||||||
</el-form-item>
|
</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>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||||
@ -168,7 +160,7 @@
|
|||||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { ContractApi, ContractVO } from '@/api/cms/contract'
|
import { ContractApi, ContractVO } from '@/api/cms/contract'
|
||||||
|
|
||||||
/** 合同 表单 */
|
/** 合同管理 表单 */
|
||||||
defineOptions({ name: 'ContractForm' })
|
defineOptions({ name: 'ContractForm' })
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
@ -179,6 +171,9 @@ const dialogTitle = ref('') // 弹窗的标题
|
|||||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
|
id: undefined,
|
||||||
|
projectId: undefined,
|
||||||
|
extContractId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
@ -187,7 +182,9 @@ const formData = ref({
|
|||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
archiveTime: undefined,
|
archiveTime: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
|
amount: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
|
provisionalSettlement: undefined,
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
contractFileUrl: undefined,
|
contractFileUrl: undefined,
|
||||||
constructionCost: undefined,
|
constructionCost: undefined,
|
||||||
@ -198,20 +195,16 @@ const formData = ref({
|
|||||||
extProportion: undefined,
|
extProportion: undefined,
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
deleted: undefined,
|
deleted: undefined,
|
||||||
tenantId: undefined,
|
tenantId: undefined,
|
||||||
amount: undefined,
|
|
||||||
preAmount: undefined,
|
|
||||||
designAmount: undefined,
|
|
||||||
surveyFees: undefined,
|
|
||||||
measurementFee: undefined,
|
|
||||||
otherFee: undefined,
|
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
|
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
||||||
name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
|
name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
|
||||||
type: [{ required: true, message: '合同类型不能为空', trigger: 'change' }],
|
type: [{ required: true, message: '合同类型不能为空', trigger: 'change' }],
|
||||||
progress: [{ required: true, message: '合同进展不能为空', trigger: 'blur' }],
|
progress: [{ required: true, message: '合同进展不能为空', trigger: 'blur' }],
|
||||||
@ -271,6 +264,9 @@ const submitForm = async () => {
|
|||||||
/** 重置表单 */
|
/** 重置表单 */
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
|
id: undefined,
|
||||||
|
projectId: undefined,
|
||||||
|
extContractId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
@ -279,7 +275,9 @@ const resetForm = () => {
|
|||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
archiveTime: undefined,
|
archiveTime: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
|
amount: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
|
provisionalSettlement: undefined,
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
contractFileUrl: undefined,
|
contractFileUrl: undefined,
|
||||||
constructionCost: undefined,
|
constructionCost: undefined,
|
||||||
@ -290,18 +288,13 @@ const resetForm = () => {
|
|||||||
extProportion: undefined,
|
extProportion: undefined,
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
deleted: undefined,
|
deleted: undefined,
|
||||||
tenantId: undefined,
|
tenantId: undefined,
|
||||||
amount: undefined,
|
|
||||||
preAmount: undefined,
|
|
||||||
designAmount: undefined,
|
|
||||||
surveyFees: undefined,
|
|
||||||
measurementFee: undefined,
|
|
||||||
otherFee: undefined,
|
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,24 @@
|
|||||||
:inline="true"
|
:inline="true"
|
||||||
label-width="68px"
|
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-form-item label="合同名称" prop="name">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.name"
|
v-model="queryParams.name"
|
||||||
@ -95,6 +113,15 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="计费方式" prop="countType">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.countType"
|
v-model="queryParams.countType"
|
||||||
@ -110,6 +137,15 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</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-form-item label="备注" prop="remark">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.remark"
|
v-model="queryParams.remark"
|
||||||
@ -135,12 +171,7 @@
|
|||||||
clearable
|
clearable
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option label="请选择字典生成" value="" />
|
||||||
v-for="dict in getStrDictOptions(DICT_TYPE.FUNDS_SOURCE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="优惠" prop="discount">
|
<el-form-item label="优惠" prop="discount">
|
||||||
@ -189,6 +220,15 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item label="创建者" prop="creator">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.creator"
|
v-model="queryParams.creator"
|
||||||
@ -248,60 +288,6 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item>
|
||||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
<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 @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||||
@ -329,6 +315,9 @@
|
|||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<ContentWrap>
|
<ContentWrap>
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
<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="name" />
|
||||||
<el-table-column label="合同类型" align="center" prop="type" />
|
<el-table-column label="合同类型" align="center" prop="type" />
|
||||||
<el-table-column label="合同进展" align="center" prop="progress" />
|
<el-table-column label="合同进展" align="center" prop="progress" />
|
||||||
@ -365,25 +354,24 @@
|
|||||||
<dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status" />
|
<dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="签订合同总额" align="center" prop="amount" />
|
||||||
<el-table-column label="计费方式" align="center" prop="countType">
|
<el-table-column label="计费方式" align="center" prop="countType">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.CONTRACT_BILLING_TYPE" :value="scope.row.countType" />
|
<dict-tag :type="DICT_TYPE.CONTRACT_BILLING_TYPE" :value="scope.row.countType" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="暂定结算数" align="center" prop="provisionalSettlement" />
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
<el-table-column label="合同url" align="center" prop="contractFileUrl" />
|
<el-table-column label="合同url" align="center" prop="contractFileUrl" />
|
||||||
<el-table-column label="建安费" align="center" prop="constructionCost" />
|
<el-table-column label="建安费" align="center" prop="constructionCost" />
|
||||||
<el-table-column label="资金来源" align="center" prop="source">
|
<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="discount" />
|
<el-table-column label="优惠" align="center" prop="discount" />
|
||||||
<el-table-column label="是否联合体" align="center" prop="consortium" />
|
<el-table-column label="是否联合体" align="center" prop="consortium" />
|
||||||
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
|
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
|
||||||
<el-table-column label="占主合同比例" align="center" prop="extProportion" />
|
<el-table-column label="占主合同比例" align="center" prop="extProportion" />
|
||||||
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
|
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
|
||||||
<el-table-column label="审核文件url" align="center" prop="reviewFileUrl" />
|
<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="创建者" align="center" prop="creator" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="创建时间"
|
label="创建时间"
|
||||||
@ -402,12 +390,6 @@
|
|||||||
/>
|
/>
|
||||||
<el-table-column label="是否删除" align="center" prop="deleted" />
|
<el-table-column label="是否删除" align="center" prop="deleted" />
|
||||||
<el-table-column label="租户编号" align="center" prop="tenantId" />
|
<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">
|
<el-table-column label="操作" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@ -449,7 +431,7 @@ import download from '@/utils/download'
|
|||||||
import { ContractApi, ContractVO } from '@/api/cms/contract'
|
import { ContractApi, ContractVO } from '@/api/cms/contract'
|
||||||
import ContractForm from './ContractForm.vue'
|
import ContractForm from './ContractForm.vue'
|
||||||
|
|
||||||
/** 合同 列表 */
|
/** 合同管理 列表 */
|
||||||
defineOptions({ name: 'Contract' })
|
defineOptions({ name: 'Contract' })
|
||||||
|
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
@ -461,6 +443,8 @@ const total = ref(0) // 列表的总页数
|
|||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
projectId: undefined,
|
||||||
|
extContractId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
@ -469,7 +453,9 @@ const queryParams = reactive({
|
|||||||
signingTime: [],
|
signingTime: [],
|
||||||
archiveTime: [],
|
archiveTime: [],
|
||||||
status: undefined,
|
status: undefined,
|
||||||
|
amount: undefined,
|
||||||
countType: undefined,
|
countType: undefined,
|
||||||
|
provisionalSettlement: undefined,
|
||||||
remark: undefined,
|
remark: undefined,
|
||||||
contractFileUrl: undefined,
|
contractFileUrl: undefined,
|
||||||
constructionCost: undefined,
|
constructionCost: undefined,
|
||||||
@ -480,18 +466,13 @@ const queryParams = reactive({
|
|||||||
extProportion: undefined,
|
extProportion: undefined,
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: [],
|
createTime: [],
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: [],
|
updateTime: [],
|
||||||
deleted: undefined,
|
deleted: undefined,
|
||||||
tenantId: undefined,
|
tenantId: undefined,
|
||||||
amount: undefined,
|
|
||||||
preAmount: undefined,
|
|
||||||
designAmount: undefined,
|
|
||||||
surveyFees: undefined,
|
|
||||||
measurementFee: undefined,
|
|
||||||
otherFee: undefined,
|
|
||||||
})
|
})
|
||||||
const queryFormRef = ref() // 搜索的表单
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
@ -547,7 +528,7 @@ const handleExport = async () => {
|
|||||||
// 发起导出
|
// 发起导出
|
||||||
exportLoading.value = true
|
exportLoading.value = true
|
||||||
const data = await ContractApi.exportContract(queryParams)
|
const data = await ContractApi.exportContract(queryParams)
|
||||||
download.excel(data, '合同.xls')
|
download.excel(data, '合同管理.xls')
|
||||||
} catch {
|
} catch {
|
||||||
} finally {
|
} finally {
|
||||||
exportLoading.value = false
|
exportLoading.value = false
|
||||||
|
@ -1,69 +1,73 @@
|
|||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// 外部合同 VO
|
// 外部合同管理 VO
|
||||||
export interface ExtContractVO {
|
export interface ExtContractVO {
|
||||||
|
id: number // 主键
|
||||||
|
contractId: number // 合同id
|
||||||
|
projectId: number // 项目id
|
||||||
name: string // 合同名称
|
name: string // 合同名称
|
||||||
type: string // 合同类型
|
type: string // 合同类型
|
||||||
customerCompanyId: number // 客户公司id
|
|
||||||
progress: string // 合同进展
|
progress: string // 合同进展
|
||||||
expectedTime: Date // 预计签订时间
|
expectedTime: Date // 预计签订时间
|
||||||
signingTime: Date // 签订时间
|
signingTime: Date // 签订时间
|
||||||
archiveTime: Date // 归档时间
|
archiveTime: Date // 归档时间
|
||||||
status: string // 状态
|
status: string // 状态
|
||||||
amount: number // 合同金额
|
amount: number // 合同总金额
|
||||||
preAmount: number // 前期费用
|
preAmount: number // 前期费用
|
||||||
designFee: number // 设计费
|
designFee: number // 设计费
|
||||||
surveyFees: number // 勘测费
|
surveyFees: number // 勘测费
|
||||||
testingFee: number // 检测费
|
testingFee: number // 检测费
|
||||||
otherFee: string // 其他费
|
otherFee: number // 其他费
|
||||||
countType: string // 计费方式
|
countType: string // 计费方式
|
||||||
remark: string // 备注
|
remark: string // 备注
|
||||||
contractFileUrl: string // 合同附件url
|
contractFileUrl: string // 合同附件url
|
||||||
constructionCost: number // 建安费
|
constructionCost: number // 建安费
|
||||||
source: string // 资金来源
|
source: string // 资金来源
|
||||||
chargingStandard: string // 收费标准
|
chargingStandard: string // 收费标准
|
||||||
discount: string // 优惠
|
discount: number // 优惠
|
||||||
consortium: boolean // 是否联合体
|
consortium: boolean // 是否联合体
|
||||||
consortiumCompany: string // 联合体单位
|
consortiumCompany: string // 联合体单位
|
||||||
reminderTime: Date // 合同提示时间
|
reminderTime: Date // 合同商议提示
|
||||||
approvedAmount: number // 审定金额
|
approvedAmount: number // 审定金额
|
||||||
reviewFileUrl: string // 审核文件url
|
reviewFileUrl: string // 审核文件url
|
||||||
|
finalEditor: string // 最后编辑人
|
||||||
creator: string // 创建者
|
creator: string // 创建者
|
||||||
createTime: Date // 创建时间
|
createTime: Date // 创建时间
|
||||||
updater: string // 更新者
|
updater: string // 更新者
|
||||||
updateTime: Date // 更新时间
|
updateTime: Date // 更新时间
|
||||||
contractId: number // 合同id
|
deleted: boolean // 是否删除
|
||||||
|
tenantId: number // 租户编号
|
||||||
}
|
}
|
||||||
|
|
||||||
// 外部合同 API
|
// 外部合同管理 API
|
||||||
export const ExtContractApi = {
|
export const ExtContractApi = {
|
||||||
// 查询外部合同分页
|
// 查询外部合同管理分页
|
||||||
getExtContractPage: async (params: any) => {
|
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) => {
|
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) => {
|
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) => {
|
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) => {
|
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) => {
|
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"
|
label-width="100px"
|
||||||
v-loading="formLoading"
|
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-form-item label="合同名称" prop="name">
|
||||||
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
<el-input v-model="formData.name" placeholder="请输入合同名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同类型" prop="type">
|
<el-form-item label="合同类型" prop="type">
|
||||||
<el-select v-model="formData.type" placeholder="请选择合同类型">
|
<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-select>
|
||||||
</el-form-item>
|
</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-form-item label="合同进展" prop="progress">
|
||||||
<el-input v-model="formData.progress" placeholder="请输入合同进展" />
|
<el-input v-model="formData.progress" placeholder="请输入合同进展" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -55,8 +63,8 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同金额" prop="amount">
|
<el-form-item label="合同总金额" prop="amount">
|
||||||
<el-input v-model="formData.amount" placeholder="请输入合同金额" />
|
<el-input v-model="formData.amount" placeholder="请输入合同总金额" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="前期费用" prop="preAmount">
|
<el-form-item label="前期费用" prop="preAmount">
|
||||||
<el-input v-model="formData.preAmount" placeholder="请输入前期费用" />
|
<el-input v-model="formData.preAmount" placeholder="请输入前期费用" />
|
||||||
@ -123,12 +131,12 @@
|
|||||||
<el-form-item label="联合体单位" prop="consortiumCompany">
|
<el-form-item label="联合体单位" prop="consortiumCompany">
|
||||||
<el-input v-model="formData.consortiumCompany" placeholder="请输入联合体单位" />
|
<el-input v-model="formData.consortiumCompany" placeholder="请输入联合体单位" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同提示时间" prop="reminderTime">
|
<el-form-item label="合同商议提示" prop="reminderTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="formData.reminderTime"
|
v-model="formData.reminderTime"
|
||||||
type="date"
|
type="date"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
placeholder="选择合同提示时间"
|
placeholder="选择合同商议提示"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="审定金额" prop="approvedAmount">
|
<el-form-item label="审定金额" prop="approvedAmount">
|
||||||
@ -137,6 +145,9 @@
|
|||||||
<el-form-item label="审核文件url" prop="reviewFileUrl">
|
<el-form-item label="审核文件url" prop="reviewFileUrl">
|
||||||
<UploadFile v-model="formData.reviewFileUrl" />
|
<UploadFile v-model="formData.reviewFileUrl" />
|
||||||
</el-form-item>
|
</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-form-item label="创建者" prop="creator">
|
||||||
<el-input v-model="formData.creator" placeholder="请输入创建者" />
|
<el-input v-model="formData.creator" placeholder="请输入创建者" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -159,8 +170,13 @@
|
|||||||
placeholder="选择更新时间"
|
placeholder="选择更新时间"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同id" prop="contractId">
|
<el-form-item label="是否删除" prop="deleted">
|
||||||
<el-input v-model="formData.contractId" placeholder="请输入合同id" />
|
<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>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@ -171,9 +187,9 @@
|
|||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
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' })
|
defineOptions({ name: 'ExtContractForm' })
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
@ -184,9 +200,11 @@ const dialogTitle = ref('') // 弹窗的标题
|
|||||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
||||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
|
id: undefined,
|
||||||
|
contractId: undefined,
|
||||||
|
projectId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
customerCompanyId: undefined,
|
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
expectedTime: undefined,
|
expectedTime: undefined,
|
||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
@ -210,19 +228,25 @@ const formData = ref({
|
|||||||
reminderTime: undefined,
|
reminderTime: undefined,
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
contractId: undefined,
|
deleted: undefined,
|
||||||
|
tenantId: undefined,
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
|
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
||||||
expectedTime: [{ required: true, message: '预计签订时间不能为空', trigger: 'blur' }],
|
expectedTime: [{ required: true, message: '预计签订时间不能为空', trigger: 'blur' }],
|
||||||
|
amount: [{ required: true, message: '合同总金额不能为空', trigger: 'blur' }],
|
||||||
countType: [{ required: true, message: '计费方式不能为空', trigger: 'change' }],
|
countType: [{ required: true, message: '计费方式不能为空', trigger: 'change' }],
|
||||||
chargingStandard: [{ required: true, message: '收费标准不能为空', trigger: 'change' }],
|
chargingStandard: [{ required: true, message: '收费标准不能为空', trigger: 'change' }],
|
||||||
consortium: [{ required: true, message: '是否联合体不能为空', trigger: 'blur' }],
|
consortium: [{ required: true, message: '是否联合体不能为空', trigger: 'blur' }],
|
||||||
createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
|
createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
|
||||||
updateTime: [{ 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
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
@ -271,9 +295,11 @@ const submitForm = async () => {
|
|||||||
/** 重置表单 */
|
/** 重置表单 */
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
|
id: undefined,
|
||||||
|
contractId: undefined,
|
||||||
|
projectId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
customerCompanyId: undefined,
|
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
expectedTime: undefined,
|
expectedTime: undefined,
|
||||||
signingTime: undefined,
|
signingTime: undefined,
|
||||||
@ -297,11 +323,13 @@ const resetForm = () => {
|
|||||||
reminderTime: undefined,
|
reminderTime: undefined,
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: undefined,
|
createTime: undefined,
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: undefined,
|
updateTime: undefined,
|
||||||
contractId: undefined,
|
deleted: undefined,
|
||||||
|
tenantId: undefined,
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
}
|
}
|
@ -8,6 +8,24 @@
|
|||||||
:inline="true"
|
:inline="true"
|
||||||
label-width="68px"
|
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-form-item label="合同名称" prop="name">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.name"
|
v-model="queryParams.name"
|
||||||
@ -24,18 +42,14 @@
|
|||||||
clearable
|
clearable
|
||||||
class="!w-240px"
|
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-select>
|
||||||
</el-form-item>
|
</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-form-item label="合同进展" prop="progress">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.progress"
|
v-model="queryParams.progress"
|
||||||
@ -93,10 +107,10 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同金额" prop="amount">
|
<el-form-item label="合同总金额" prop="amount">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.amount"
|
v-model="queryParams.amount"
|
||||||
placeholder="请输入合同金额"
|
placeholder="请输入合同总金额"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
@ -238,7 +252,7 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="合同提示时间" prop="reminderTime">
|
<el-form-item label="合同商议提示" prop="reminderTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="queryParams.reminderTime"
|
v-model="queryParams.reminderTime"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
@ -258,6 +272,15 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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-form-item label="创建者" prop="creator">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.creator"
|
v-model="queryParams.creator"
|
||||||
@ -298,10 +321,20 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</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
|
<el-input
|
||||||
v-model="queryParams.contractId"
|
v-model="queryParams.tenantId"
|
||||||
placeholder="请输入合同id"
|
placeholder="请输入租户编号"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
@ -314,7 +347,7 @@
|
|||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
@click="openForm('create')"
|
@click="openForm('create')"
|
||||||
v-hasPermi="['cms-ext:ext-contract:create']"
|
v-hasPermi="['cms:ext-contract:create']"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||||
</el-button>
|
</el-button>
|
||||||
@ -323,7 +356,7 @@
|
|||||||
plain
|
plain
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
:loading="exportLoading"
|
:loading="exportLoading"
|
||||||
v-hasPermi="['cms-ext:ext-contract:export']"
|
v-hasPermi="['cms:ext-contract:export']"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||||
</el-button>
|
</el-button>
|
||||||
@ -334,9 +367,15 @@
|
|||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<ContentWrap>
|
<ContentWrap>
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
<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="name" />
|
||||||
<el-table-column label="合同类型" align="center" prop="type" />
|
<el-table-column label="合同类型" align="center" prop="type">
|
||||||
<el-table-column label="客户公司id" align="center" prop="customerCompanyId" />
|
<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="合同进展" align="center" prop="progress" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="预计签订时间"
|
label="预计签订时间"
|
||||||
@ -364,7 +403,7 @@
|
|||||||
<dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status" />
|
<dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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="preAmount" />
|
||||||
<el-table-column label="设计费" align="center" prop="designFee" />
|
<el-table-column label="设计费" align="center" prop="designFee" />
|
||||||
<el-table-column label="勘测费" align="center" prop="surveyFees" />
|
<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="consortium" />
|
||||||
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
|
<el-table-column label="联合体单位" align="center" prop="consortiumCompany" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="合同提示时间"
|
label="合同商议提示"
|
||||||
align="center"
|
align="center"
|
||||||
prop="reminderTime"
|
prop="reminderTime"
|
||||||
:formatter="dateFormatter"
|
:formatter="dateFormatter"
|
||||||
@ -400,6 +439,7 @@
|
|||||||
/>
|
/>
|
||||||
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
|
<el-table-column label="审定金额" align="center" prop="approvedAmount" />
|
||||||
<el-table-column label="审核文件url" align="center" prop="reviewFileUrl" />
|
<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="创建者" align="center" prop="creator" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="创建时间"
|
label="创建时间"
|
||||||
@ -416,14 +456,15 @@
|
|||||||
:formatter="dateFormatter"
|
:formatter="dateFormatter"
|
||||||
width="180px"
|
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">
|
<el-table-column label="操作" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-button
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="openForm('update', scope.row.id)"
|
@click="openForm('update', scope.row.id)"
|
||||||
v-hasPermi="['cms-ext:ext-contract:update']"
|
v-hasPermi="['cms:ext-contract:update']"
|
||||||
>
|
>
|
||||||
编辑
|
编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
@ -431,7 +472,7 @@
|
|||||||
link
|
link
|
||||||
type="danger"
|
type="danger"
|
||||||
@click="handleDelete(scope.row.id)"
|
@click="handleDelete(scope.row.id)"
|
||||||
v-hasPermi="['cms-ext:ext-contract:delete']"
|
v-hasPermi="['cms:ext-contract:delete']"
|
||||||
>
|
>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
@ -455,10 +496,10 @@
|
|||||||
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { dateFormatter } from '@/utils/formatTime'
|
import { dateFormatter } from '@/utils/formatTime'
|
||||||
import download from '@/utils/download'
|
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'
|
import ExtContractForm from './ExtContractForm.vue'
|
||||||
|
|
||||||
/** 外部合同 列表 */
|
/** 外部合同管理 列表 */
|
||||||
defineOptions({ name: 'ExtContract' })
|
defineOptions({ name: 'ExtContract' })
|
||||||
|
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
@ -470,9 +511,10 @@ const total = ref(0) // 列表的总页数
|
|||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
contractId: undefined,
|
||||||
|
projectId: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
customerCompanyId: undefined,
|
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
expectedTime: [],
|
expectedTime: [],
|
||||||
signingTime: [],
|
signingTime: [],
|
||||||
@ -496,11 +538,13 @@ const queryParams = reactive({
|
|||||||
reminderTime: [],
|
reminderTime: [],
|
||||||
approvedAmount: undefined,
|
approvedAmount: undefined,
|
||||||
reviewFileUrl: undefined,
|
reviewFileUrl: undefined,
|
||||||
|
finalEditor: undefined,
|
||||||
creator: undefined,
|
creator: undefined,
|
||||||
createTime: [],
|
createTime: [],
|
||||||
updater: undefined,
|
updater: undefined,
|
||||||
updateTime: [],
|
updateTime: [],
|
||||||
contractId: undefined,
|
deleted: undefined,
|
||||||
|
tenantId: undefined,
|
||||||
})
|
})
|
||||||
const queryFormRef = ref() // 搜索的表单
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
@ -556,7 +600,7 @@ const handleExport = async () => {
|
|||||||
// 发起导出
|
// 发起导出
|
||||||
exportLoading.value = true
|
exportLoading.value = true
|
||||||
const data = await ExtContractApi.exportExtContract(queryParams)
|
const data = await ExtContractApi.exportExtContract(queryParams)
|
||||||
download.excel(data, '外部合同.xls')
|
download.excel(data, '外部合同管理.xls')
|
||||||
} catch {
|
} catch {
|
||||||
} finally {
|
} finally {
|
||||||
exportLoading.value = false
|
exportLoading.value = false
|
Reference in New Issue
Block a user