Skip to content

Commit 24f0522

Browse files
fit2cloudwxxfit2-zhao
authored andcommitted
feat: approval closed status display
1 parent da22f4f commit 24f0522

File tree

7 files changed

+20
-1
lines changed

7 files changed

+20
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ export enum ContractInvoiceStatusEnum {
2626
UNAPPROVED = 'UNAPPROVED', // 未通过
2727
APPROVING = 'APPROVING', // 提审中
2828
REVOKED = 'REVOKED', // 撤销
29+
NONE = 'NONE', // 未开启审批状态
2930
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export enum QuotationStatusEnum {
1111
APPROVING = 'APPROVING', // 提审
1212
VOIDED = 'VOIDED', // 作废
1313
REVOKED = 'REVOKED', // 撤销
14+
NONE = 'NONE', // 未开启审批状态
1415
}
1516

1617
export default {};

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,16 @@ export const contractInvoiceStatus = {
4444
icon: 'iconicon_close_circle_filled',
4545
color: 'var(--error-red)',
4646
},
47-
[ContractBusinessTitleStatusEnum.REVOKED]: {
47+
[ContractInvoiceStatusEnum.REVOKED]: {
4848
label: t('common.revoke'),
4949
icon: 'iconicon_skip_planarity',
5050
color: 'var(--text-n4)',
5151
},
52+
[ContractInvoiceStatusEnum.NONE]: {
53+
label: '-',
54+
icon: '',
55+
color: '',
56+
},
5257
};
5358

5459
export const contractStatusOptions = [
@@ -187,4 +192,5 @@ export const deleteInvoiceContentMap = {
187192
[ContractInvoiceStatusEnum.APPROVED]: t('contract.deleteInvoiceApprovedContent'),
188193
[ContractInvoiceStatusEnum.REVOKED]: t('contract.deleteInvoiceRevokedContent'),
189194
[ContractInvoiceStatusEnum.UNAPPROVED]: t('contract.deleteInvoiceRejectedContent'),
195+
[ContractInvoiceStatusEnum.NONE]: t('contract.deleteInvoiceNoneContent'),
190196
};

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,8 @@ export const quotationStatusOptions = [
117117
value: QuotationStatusEnum.REVOKED,
118118
label: t('common.revoke'),
119119
},
120+
{
121+
value: QuotationStatusEnum.NONE,
122+
label: '-',
123+
},
120124
];

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,5 @@ export default {
7575
'Invoice not approved, deleting does not affect the invoiced amount of the contract, please proceed with caution!',
7676
'contract.deleteInvoiceRevokedContent':
7777
'Invoice revoked, deleting does not affect the invoiced amount of the contract, please proceed with caution!',
78+
'contract.deleteInvoiceNoneContent': 'Cannot recover after deletion, please careful operation!',
7879
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,5 @@ export default {
6969
'contract.deleteInvoiceApprovedContent': '发票审核已通过,删除后,合同已开票金额将减去本次申请开票金额,请谨慎操作!',
7070
'contract.deleteInvoiceRejectedContent': '发票审核未通过,删除不影响合同已开票金额,请谨慎操作!',
7171
'contract.deleteInvoiceRevokedContent': '发票审核已撤销,删除不影响合同已开票金额,请谨慎操作!',
72+
'contract.deleteInvoiceNoneContent': '删除后无法恢复,请谨慎操作!',
7273
};

frontend/packages/web/src/views/opportunity/components/quotation/quotationStatus.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
icon: 'iconicon_skip_planarity',
4545
color: 'var(--text-n4)',
4646
},
47+
[QuotationStatusEnum.NONE]: {
48+
label: '-',
49+
icon: '',
50+
color: '',
51+
},
4752
};
4853
</script>
4954

0 commit comments

Comments
 (0)