diff --git a/src/dicts/supplierAnnualReviewDict.ts b/src/dicts/supplierAnnualReviewDict.ts index 512f3ef..88e4d9ac 100644 --- a/src/dicts/supplierAnnualReviewDict.ts +++ b/src/dicts/supplierAnnualReviewDict.ts @@ -11,7 +11,7 @@ export const AnnualReviewStatus = { // 审查状态文本 export const AnnualReviewStatusText = { [AnnualReviewStatus.WAITING]: '未开始', - [AnnualReviewStatus.ONGOING]: '审核中', + [AnnualReviewStatus.ONGOING]: '审批中', [AnnualReviewStatus.COMPLETED]: '已完成', [AnnualReviewStatus.EXPIRED]: '已过期', }; diff --git a/src/dicts/supplierEvaluateDict.ts b/src/dicts/supplierEvaluateDict.ts index 2b82ac0..6df4859 100644 --- a/src/dicts/supplierEvaluateDict.ts +++ b/src/dicts/supplierEvaluateDict.ts @@ -26,8 +26,8 @@ export const ApprovalResult = { export const ApprovalResultText = { [ApprovalResult.PENDING]: '待审批', - [ApprovalResult.APPROVED]: '审核通过', - [ApprovalResult.REJECTED]: '审核驳回', + [ApprovalResult.APPROVED]: '审批通过', + [ApprovalResult.REJECTED]: '审批驳回', }; export const ApprovalResultColor = { diff --git a/src/locales/en-US/menu.ts b/src/locales/en-US/menu.ts index 0b4126a..665e8b7 100644 --- a/src/locales/en-US/menu.ts +++ b/src/locales/en-US/menu.ts @@ -59,24 +59,24 @@ export default { 'menu.admission': 'Supplier Admission', 'menu.admissionManagement': 'Supplier Admission Management', 'menu.admissionReviewManagement': 'Supplier Admission Review', - 'menu.SupplierEntryReview': 'Supplier Entry Review', + 'menu.SupplierEntryReview': 'Supplier Entry Approval', 'menu.SupplierCategoryEntry': 'Supplier Category Entry', - 'menu.SupplierCategoryEntryReview': 'Supplier Category Entry Review', + 'menu.SupplierCategoryEntryReview': 'Supplier Category Entry Approval', 'menu.informationManagement': 'Supplier Information Management', 'menu.SupplierRegisterAgent': 'Supplier Registration Agency', 'menu.SupplierChangeManage': 'Supplier Change Management', - 'menu.SupplierChangeReviewManage': 'Supplier Change Review', + 'menu.SupplierChangeReviewManage': 'Supplier Change Approval', 'menu.category': 'Supplier Category Library', 'menu.categoryManage': 'Category Management', 'menu.categoryLibraryManage': 'Category Library Management', - 'menu.categoryLibraryReview': 'Category Library Review', + 'menu.categoryLibraryReview': 'Category Library Approval', 'menu.supplierEntryManage': 'Supplier Entry Management', - 'menu.supplierEntryReview': 'Supplier Entry Review', + 'menu.supplierEntryReview': 'Supplier Entry Approval', 'menu.supplierBlacklist': 'Supplier Black/Grey List Management', 'menu.blacklistManage': 'Supplier Black/Grey List', - 'menu.blacklistAudit': 'Supplier Black/Grey List Audit', + 'menu.blacklistAudit': 'Supplier Black/Grey List Approval', 'menu.supplierExit': 'Supplier Exit Management', 'menu.supplierExitManage': 'Supplier Exit', - 'menu.supplierExitAudit': 'Supplier Exit Audit', + 'menu.supplierExitAudit': 'Supplier Exit Approval', 'menu.supplierMessage': 'Message Notification', }; diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts index 1899c28..192fa63 100644 --- a/src/locales/zh-CN/menu.ts +++ b/src/locales/zh-CN/menu.ts @@ -61,24 +61,24 @@ export default { 'menu.admission': '供应商准入', 'menu.admissionManagement': '供应商准入管理', 'menu.admissionReviewManagement': '供应商准入评审管理', - 'menu.SupplierEntryReview': '供应商准入审核管理', + 'menu.SupplierEntryReview': '供应商准入审批管理', 'menu.SupplierCategoryEntry': '供应商品类准入管理', - 'menu.SupplierCategoryEntryReview': '供应商品类准入审核管理', + 'menu.SupplierCategoryEntryReview': '供应商品类准入审批管理', 'menu.informationManagement': '供应商信息管理', 'menu.SupplierRegisterAgent': '供应商注册代录', 'menu.SupplierChangeManage': '供应商变更管理', - 'menu.SupplierChangeReviewManage': '供应商变更审核管理', + 'menu.SupplierChangeReviewManage': '供应商变更审批管理', 'menu.category': '供应商品类库', 'menu.categoryManage': '品类管理', 'menu.categoryLibraryManage': '品类库管理', - 'menu.categoryLibraryReview': '品类库建库审核管理', + 'menu.categoryLibraryReview': '品类库建库审批管理', 'menu.supplierEntryManage': '供应商入库管理', - 'menu.supplierEntryReview': '供应商入库审核管理', + 'menu.supplierEntryReview': '供应商入库审批管理', 'menu.supplierBlacklist': '供应商黑名单管理', 'menu.blacklistManage': '供应商黑名单管理', - 'menu.blacklistAudit': '供应商黑名单审核管理', + 'menu.blacklistAudit': '供应商黑名单审批管理', 'menu.supplierExit': '供应商退出管理', 'menu.supplierExitManage': '供应商退出管理', - 'menu.supplierExitAudit': '供应商退出审核管理', + 'menu.supplierExitAudit': '供应商退出审批管理', 'menu.supplierMessage': '消息通知', }; diff --git a/src/locales/zh-CN/supplierEvaluateResult.ts b/src/locales/zh-CN/supplierEvaluateResult.ts index 78e8cc2..14a3a49 100644 --- a/src/locales/zh-CN/supplierEvaluateResult.ts +++ b/src/locales/zh-CN/supplierEvaluateResult.ts @@ -31,7 +31,7 @@ export default { 'supplierEvaluateResult.column.startTime': '评价开始时间', 'supplierEvaluateResult.column.endTime': '评价结束时间', 'supplierEvaluateResult.column.statusName': '评价状态', - 'supplierEvaluateResult.column.approveName': '审核状态', + 'supplierEvaluateResult.column.approveName': '审批状态', 'supplierEvaluateResult.column.action': '操作', 'supplierEvaluateResult.column.supplierName': '供应商名称', 'supplierEvaluateResult.column.reviewScore': '评价得分', diff --git a/src/pages/supplier/admission/admissionManagement/components/ApproveModal.tsx b/src/pages/supplier/admission/admissionManagement/components/ApproveModal.tsx index eaff99c..f5c32ca 100644 --- a/src/pages/supplier/admission/admissionManagement/components/ApproveModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/ApproveModal.tsx @@ -9,7 +9,7 @@ const ApproveModal: React.FC<{ onConfirm?: () => void; dispatch: any; }> = ({ visible, record = {}, onCancel, onConfirm , dispatch }) => { - + const suppliers = record?.suppliers || [ { key: 's1', name: '中山市合创展包装材料有限公司' }, { key: 's2', name: '广东振兴塑胶机械有限公司' }, @@ -26,7 +26,7 @@ const ApproveModal: React.FC<{ { item: '供应商社会准则符合性自审问卷', results: { s1: '合格', s2: '合格' }, remarks: {} }, { item: '是否为禁止使用供应商', results: { s1: '合格', s2: '合格' }, remarks: {} }, { item: '3年内在经营活动中没有重大违法记录的书面声明', results: { s1: '合格', s2: '合格' }, remarks: {} }, - { item: '企业存续状态审核(营业执照等)', results: { s1: '合格', s2: '合格' }, remarks: {} }, + { item: '企业存续状态审批(营业执照等)', results: { s1: '合格', s2: '合格' }, remarks: {} }, { item: '行业资质、认证情况(选填)', results: { s1: '合格', s2: '合格' }, remarks: {} }, { item: '现场考察、产品试用情况(按需)', results: { s1: '合格', s2: '合格' }, remarks: {} }, { item: '结果汇总', results: { s1: '合格', s2: '合格' }, remarks: {} }, @@ -112,4 +112,4 @@ const ApproveModal: React.FC<{ ); }; -export default ApproveModal; \ No newline at end of file +export default ApproveModal; diff --git a/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx b/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx index 9f9b68c..def9a12 100644 --- a/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx @@ -181,7 +181,7 @@ const CreateModal: React.FC<{ visible: boolean; onCancel: () => void; }> = ({ vi finalPayload.supplierIds.push(item.id) }) if (values.accessType === 'online') { - // 评审时间 + // 评审时间 if (values.rangePicker && values.rangePicker.length === 2) { const [start, end] = values.rangePicker; finalPayload.coscoAccessWork.startTime = start.format('YYYY-MM-DD HH:mm'); @@ -478,7 +478,7 @@ const CreateModal: React.FC<{ visible: boolean; onCancel: () => void; }> = ({ vi