Skip to content

Commit ee170d9

Browse files
committed
feat: add contract stage
1 parent c84b2bf commit ee170d9

File tree

9 files changed

+16
-2
lines changed

9 files changed

+16
-2
lines changed

backend/crm/src/main/java/cn/cordys/crm/contract/constants/ContractStage.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public enum ContractStage {
1717
*/
1818
SIGNED,
1919

20+
/**
21+
* 合同变更
22+
*/
23+
CHANGE,
24+
2025
/**
2126
* 履行中
2227
*/

backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/ContractStageRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ContractStageRequest {
1414
private String id;
1515

1616

17-
@Schema(description = "阶段: PENDING_SIGNING/SIGNED/IN_PROGRESS/COMPLETED_PERFORMANCE/VOID/ARCHIVED", requiredMode = Schema.RequiredMode.REQUIRED)
17+
@Schema(description = "阶段: PENDING_SIGNING/SIGNED/CHANGE/IN_PROGRESS/COMPLETED_PERFORMANCE/VOID/ARCHIVED", requiredMode = Schema.RequiredMode.REQUIRED)
1818
private String stage;
1919

2020

backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ public List<FilterCondition> getDefaultSourceFilters() {
796796
stageCondition.setName("stage");
797797
stageCondition.setOperator(FilterCondition.CombineConditionOperator.IN.name());
798798
stageCondition.setValue(List.of(ContractStage.PENDING_SIGNING.name(), ContractStage.SIGNED.name(),
799-
ContractStage.IN_PROGRESS.name(), ContractStage.COMPLETED_PERFORMANCE.name()));
799+
ContractStage.IN_PROGRESS.name(), ContractStage.COMPLETED_PERFORMANCE.name(), ContractStage.CHANGE.name()));
800800
conditions.add(stageCondition);
801801

802802
return conditions;

backend/crm/src/main/resources/i18n/cordys-crm_en_US.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ contract.archived_status.archived=Archived
737737
contract.archived_status.un_archived=Un Archived
738738
contract.stage.pending_signing=Pending Signing
739739
contract.stage.signed=Signed
740+
contract.stage.change=Change
740741
contract.stage.in_progress=In Progress
741742
contract.stage.completed_performance=Completed Performance
742743
contract.stage.void=Void

backend/crm/src/main/resources/i18n/cordys-crm_zh_CN.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ contract.archived_status.archived=已归档
737737
contract.archived_status.un_archived=未归档
738738
contract.stage.pending_signing=待签署
739739
contract.stage.signed=已签署
740+
contract.stage.change=合同变更
740741
contract.stage.in_progress=履行中
741742
contract.stage.completed_performance=履行完毕
742743
contract.stage.void=作废

frontend/packages/lib-shared/enums/contractEnum.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export enum ContractStatusEnum {
22
PENDING_SIGNING = 'PENDING_SIGNING', // 待签署
33
SIGNED = 'SIGNED', // 已签署
4+
CHANGE = 'CHANGE', //合同变更
45
IN_PROGRESS = 'IN_PROGRESS', // 履行中
56
COMPLETED_PERFORMANCE = 'COMPLETED_PERFORMANCE', // 履行完毕
67
VOID = 'VOID', // 作废

frontend/packages/web/src/config/contract.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ export const contractStatusOptions = [
6060
value: ContractStatusEnum.SIGNED,
6161
label: t('contract.signed'),
6262
},
63+
{
64+
value: ContractStatusEnum.CHANGE,
65+
label: t('contract.change'),
66+
},
6367
{
6468
value: ContractStatusEnum.IN_PROGRESS,
6569
label: t('contract.inProgress'),

frontend/packages/web/src/views/contract/locale/en-US.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default {
1010
'contract.changeStageTip': 'The contract stage can be changed only after approval and with the required permission',
1111
'contract.toBeSigned': 'To be signed',
1212
'contract.signed': 'Signed',
13+
'contract.change': 'Change',
1314
'contract.inProgress': 'In Progress',
1415
'contract.completedPerformance': 'Completed',
1516
'contract.uncompleted': 'Incomplete',

frontend/packages/web/src/views/contract/locale/zh-CN.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default {
1010
'contract.changeStageTip': '修改合同阶段需满足:审批状态为通过 + 合同阶段变更权限',
1111
'contract.toBeSigned': '待签署',
1212
'contract.signed': '已签署',
13+
'contract.change': '合同变更',
1314
'contract.inProgress': '履行中',
1415
'contract.completedPerformance': '履行完毕',
1516
'contract.uncompleted': '未完成',

0 commit comments

Comments
 (0)