Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ public enum ContractStage {
*/
SIGNED,

/**
* 合同变更
*/
CHANGE,

/**
* 履行中
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ContractStageRequest {
private String id;


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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ public List<FilterCondition> getDefaultSourceFilters() {
stageCondition.setName("stage");
stageCondition.setOperator(FilterCondition.CombineConditionOperator.IN.name());
stageCondition.setValue(List.of(ContractStage.PENDING_SIGNING.name(), ContractStage.SIGNED.name(),
ContractStage.IN_PROGRESS.name(), ContractStage.COMPLETED_PERFORMANCE.name()));
ContractStage.IN_PROGRESS.name(), ContractStage.COMPLETED_PERFORMANCE.name(), ContractStage.CHANGE.name()));
conditions.add(stageCondition);

return conditions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ contract.archived_status.archived=Archived
contract.archived_status.un_archived=Un Archived
contract.stage.pending_signing=Pending Signing
contract.stage.signed=Signed
contract.stage.change=Change
contract.stage.in_progress=In Progress
contract.stage.completed_performance=Completed Performance
contract.stage.void=Void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ contract.archived_status.archived=已归档
contract.archived_status.un_archived=未归档
contract.stage.pending_signing=待签署
contract.stage.signed=已签署
contract.stage.change=合同变更
contract.stage.in_progress=履行中
contract.stage.completed_performance=履行完毕
contract.stage.void=作废
Expand Down
1 change: 1 addition & 0 deletions frontend/packages/lib-shared/enums/contractEnum.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export enum ContractStatusEnum {
PENDING_SIGNING = 'PENDING_SIGNING', // 待签署
SIGNED = 'SIGNED', // 已签署
CHANGE = 'CHANGE', //合同变更
IN_PROGRESS = 'IN_PROGRESS', // 履行中
COMPLETED_PERFORMANCE = 'COMPLETED_PERFORMANCE', // 履行完毕
VOID = 'VOID', // 作废
Expand Down
4 changes: 4 additions & 0 deletions frontend/packages/web/src/config/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ export const contractStatusOptions = [
value: ContractStatusEnum.SIGNED,
label: t('contract.signed'),
},
{
value: ContractStatusEnum.CHANGE,
label: t('contract.change'),
},
{
value: ContractStatusEnum.IN_PROGRESS,
label: t('contract.inProgress'),
Expand Down
1 change: 1 addition & 0 deletions frontend/packages/web/src/views/contract/locale/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default {
'contract.changeStageTip': 'The contract stage can be changed only after approval and with the required permission',
'contract.toBeSigned': 'To be signed',
'contract.signed': 'Signed',
'contract.change': 'Change',
'contract.inProgress': 'In Progress',
'contract.completedPerformance': 'Completed',
'contract.uncompleted': 'Incomplete',
Expand Down
1 change: 1 addition & 0 deletions frontend/packages/web/src/views/contract/locale/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default {
'contract.changeStageTip': '修改合同阶段需满足:审批状态为通过 + 合同阶段变更权限',
'contract.toBeSigned': '待签署',
'contract.signed': '已签署',
'contract.change': '合同变更',
'contract.inProgress': '履行中',
'contract.completedPerformance': '履行完毕',
'contract.uncompleted': '未完成',
Expand Down
Loading