From a78f128c2621d0a36e82e360523c1fdd43d3666c Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 9 Aug 2024 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=95=B4=E7=90=86=E5=A4=9A=E8=AF=AD=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/locales/en/products.json | 321 +++++++++++++++----------------- public/locales/zh/products.json | 17 +- src/views/products/Audit.jsx | 4 +- 3 files changed, 150 insertions(+), 192 deletions(-) diff --git a/public/locales/en/products.json b/public/locales/en/products.json index 9efaeec..caebbd2 100644 --- a/public/locales/en/products.json +++ b/public/locales/en/products.json @@ -1,175 +1,146 @@ -{ - "ProductType": "Product Type", - "type": { - "Experience": "Experience", - "Car": "Transport Services", - "Guide": "Guide Services", - "Package": "Package Tour", - "Attractions": "Attractions", - "Meals": "Meals", - "Extras": "Extras", - "UltraService": "Ultra Service" - }, - "EditComponents": { - "info": "Product Information", - "Quotation": "Quotation", - "Extras": "Components" - }, - "auditState": { - "New": "New", - "Pending": "Pending", - "Approved": "Approved", - "Rejected": "Rejected", - "Published": "Published" - }, - "auditStateAction": { - "New": "New", - "Pending": "Pending", - "Approved": "Approve", - "Rejected": "Reject", - "Published": "Publish" - }, - "PriceUnit": { - "0": "per Person", - "1": "per Group", - "title": "Price Unit" - }, - "Status": "Status", - "State": "State", - - "Title": "Title", - "Vendor": "Vendor", - "AuState": "Audit State", - "CreatedBy": "Created By", - "CreateDate": "Create Date", - "AuditedBy": "Audited By", - "AuditDate": "Audit Date", - "AuditRes": "Audit Result", - "OpenHours": "Open Hours", - "Duration": "Duration", - "KM": "KM", - "RecommendsRate": "Recommends Rate", - "OpenWeekdays": "Open Weekdays", - "DisplayToC": "Display To C", - "Dept": "Dept", - - "productProject": "Product project", - "Code": "Code", - "City": "City", - "Remarks": "Memo", - "tourTime": "Tour time", - "recommendationRate": "Recommends rate", - "Name": "Name", - "Price":"Price", - "Description":"Description", - "supplierQuotation": "Supplier quotation", - "addQuotation": "Add quotation", - "bindingProducts": "Binding products", - "addBinding": "Add binding", - - "adultPrice": "Adult price", - "childrenPrice": "Child price", - "currency": "Currency", - "unit_name": "类型", - "group_size": "人等", - "use_dates": "有效期", - "operation": "操作", - "price": "价格", - "Offer": "报价", - "Weekdays": "周末", - "OnWeekdays": "On Weekdays: ", - "Unlimited": "Unlimited", - - "UseYear": "Use Year", - - "AgeType": { - "Type": "Age Type", - "Adult": "Adult", - "Child": "Child" - }, - - "CopyFormMsg": { - "Source": "Source ", - "target": "Target ", - "withQuote": "Whether to copy the quotation", - "requiredVendor": "Please pick a target vendor", - "requiredTypes": "Please select product types", - "requiredDept": "Please pick a owner department" - }, - "Validation": { - "adultPrice": "请输入成人价", - "childrenPrice": "请输入儿童价", - "currency": "请输入币种", - "unit_name": "请输入类型", - "group_size_min": "请输入人等", - "group_size_max": "请输入人等", - "use_dates": "请输入有效期" - }, - "sureSubmitAudit": "确认提交所有产品审核? 提交后,所有产品将进入待审核流程. ", - "FormTooltip": { - "Type": "Product Type", - "Title": "Title", - "Code": "Code", - "City": "起始城市,举例:北京", - "Dept": "Department", - "Duration": "", - "RecommendsRate": "", - "OpenHours": "Open Hours", - "OpenWeekdays": "Open Weekdays", - "DisplayToC": "", - "KM": "", - "Description": "", - "Remarks": "", - "UseDates": "数值越短,价格越优先。举例:英文导游1.1-12.31价300元, 8.1-8.31价400元,如走团时间为8月,自动取400元。", - "NewTitle": { - "6": "", - "B": "A点-B点(有疑议的需加往返/单程),举例:北京大兴机场-市区(单程)", - "J": "A点-B点时长车费(有疑议的需加往返/单程),举例:张家界高铁站-市区(车费,单程)", - "Q": "城市语种导游工资单位,举例:北京英语导游工资(元/天/团)", - "7": "官方景点名称,举例:陕西历史博物馆", - "R": "普通餐标、豪华餐标、特色餐标,举例:普通餐标", - "8": "举例:故宫导游门票、上海外滩深度游导游补助", - "D": "城市A点-B点时间包含内容,举例:北京市区一日游(车导)" - }, - "----Todo: 下面一组待定": "#", - "6": { - "Title": "", - "#": "" - }, - "B": { - "Title": "A点-B点,举例:桂林-龙胜", - "#": "" - }, - "J": { - "Title": "A点-B点时长车费,举例:张家界5晚6天车费", - "#": "" - }, - "Q": { - "Title": "城市语种导游工资单位,举例:北京英文导游工资(元/天/团)", - "#": "" - }, - "7": { - "Title": "官方景点名称,举例:陕西历史博物馆", - "#": "" - }, - "R": { - "Title": "普通、豪华、特色餐标,举例:普通餐标", - "#": "" - }, - "8": { - "Title": "举例:故宫导游门票", - "#": "" - }, - "D": { - "Title": "城市A点-B点时间包含内容,举例:北京市区一日游车导", - "#": "" - } - }, - - "LgcModal": { - "title": "Add language", - "placeholder": "Pick a language" - }, - - "#": "Product" -} +{ + "ProductType": "Product Type", + "type": { + "Experience": "Experience", + "Car": "Transport Services", + "Guide": "Guide Services", + "Package": "Package Tour", + "Attractions": "Attractions", + "Meals": "Meals", + "Extras": "Extras", + "UltraService": "Ultra Service" + }, + "EditComponents": { + "info": "Product Information", + "Quotation": "Quotation", + "Extras": "Components" + }, + "auditState": { + "New": "New", + "Pending": "Pending", + "Approved": "Approved", + "Rejected": "Rejected", + "Published": "Published" + }, + "auditStateAction": { + "New": "New", + "Pending": "Pending", + "Approved": "Approve", + "Rejected": "Reject", + "Published": "Publish" + }, + "PriceUnit": { + "0": "per Person", + "1": "per Group", + "title": "Price Unit" + }, + "State": "State", + "Title": "Title", + "Vendor": "Vendor", + "AuState": "Audit State", + "CreatedBy": "Created By", + "CreateDate": "Create Date", + "AuditedBy": "Audited By", + "AuditDate": "Audit Date", + "AuditRes": "Audit Result", + "OpenHours": "Open Hours", + "Duration": "Duration", + "KM": "KM", + "RecommendsRate": "Recommends Rate", + "OpenWeekdays": "Open Weekdays", + "DisplayToC": "Display To C", + "Dept": "Dept", + "Code": "Code", + "City": "City", + "Remarks": "Memo", + "Description": "Description", + "addQuotation": "Add quotation", + "adultPrice": "Adult price", + "childrenPrice": "Child price", + "currency": "Currency", + "unit_name": "Unit", + "group_size": "Group Size", + "use_dates": "Use Dates", + "operation": "operation", + "price": "Price", + "Offer": "Offer", + "Weekdays": "Weekdays", + "OnWeekdays": "On Weekdays: ", + "Unlimited": "Unlimited", + "UseYear": "Use Year", + "AgeType": { + "Type": "Age Type", + "Adult": "Adult", + "Child": "Child" + }, + "CopyFormMsg": { + "Source": "Source ", + "target": "Target ", + "withQuote": "Whether to copy the quotation", + "requiredVendor": "Please pick a target vendor", + "requiredTypes": "Please select product types", + "requiredDept": "Please pick a owner department" + }, + "Validation": { + "adultPrice": "请输入成人价", + "childrenPrice": "请输入儿童价", + "currency": "请输入币种", + "unit_name": "请输入类型", + "group_size_min": "请输入人等", + "group_size_max": "请输入人等", + "use_dates": "请输入有效期" + }, + "sureSubmitAudit": "确认提交所有产品审核? 提交后,所有产品将进入待审核流程. ", + "FormTooltip": { + "Type": "Product Type", + "Title": "Title", + "Code": "Code", + "City": "起始城市,举例:北京", + "Dept": "Department", + "Duration": "", + "RecommendsRate": "", + "OpenHours": "Open Hours", + "OpenWeekdays": "Open Weekdays", + "DisplayToC": "", + "KM": "", + "Description": "", + "Remarks": "", + "UseDates": "数值越短,价格越优先。举例:英文导游1.1-12.31价300元, 8.1-8.31价400元,如走团时间为8月,自动取400元。", + "NewTitle": { + "6": "", + "7": "官方景点名称,举例:陕西历史博物馆", + "8": "举例:故宫导游门票、上海外滩深度游导游补助", + "B": "A点-B点(有疑议的需加往返/单程),举例:北京大兴机场-市区(单程)", + "J": "A点-B点时长车费(有疑议的需加往返/单程),举例:张家界高铁站-市区(车费,单程)", + "Q": "城市语种导游工资单位,举例:北京英语导游工资(元/天/团)", + "R": "普通餐标、豪华餐标、特色餐标,举例:普通餐标", + "D": "城市A点-B点时间包含内容,举例:北京市区一日游(车导)" + }, + "----Todo: 下面一组待定": "#", + "B": { + "Title": "A点-B点,举例:桂林-龙胜", + "#": "" + }, + "J": { + "Title": "A点-B点时长车费,举例:张家界5晚6天车费", + "#": "" + }, + "Q": { + "Title": "城市语种导游工资单位,举例:北京英文导游工资(元/天/团)", + "#": "" + }, + "R": { + "Title": "普通、豪华、特色餐标,举例:普通餐标", + "#": "" + }, + "D": { + "Title": "城市A点-B点时间包含内容,举例:北京市区一日游车导", + "#": "" + } + }, + "LgcModal": { + "title": "Add language", + "placeholder": "Pick a language" + }, + "#": "Product" +} diff --git a/public/locales/zh/products.json b/public/locales/zh/products.json index b72c46b..beaef69 100644 --- a/public/locales/zh/products.json +++ b/public/locales/zh/products.json @@ -34,7 +34,6 @@ "1": "每团", "title": "报价单位" }, - "Status": "状态", "State": "状态", "Title": "名称", "Vendor": "供应商", @@ -51,32 +50,21 @@ "OpenWeekdays": "开放时间", "DisplayToC": "报价信显示", "Dept": "小组", - "productProject": "产品项目", "Code": "简码", "City": "城市", "Remarks": "备注", - "tourTime": "游览时间", - "recommendationRate": "推荐指数", - "Name": "名称", - "Price": "价格", "Description": "描述", - "supplierQuotation": "供应商报价", "addQuotation": "添加报价", - "bindingProducts": "绑定产品", - "addBinding": "添加绑定", "adultPrice": "成人价", "childrenPrice": "儿童价", "currency": "币种", - "unit_name": "类型", "group_size": "人等", "use_dates": "有效期", "operation": "操作", "price": "价格", "Offer": "报价", - "Weekdays": "周末", - "OnWeekdays": "周: ", "Unlimited": "不限", "UseYear": "年份", @@ -120,16 +108,15 @@ "UseDates": "数值越短,价格越优先。举例:英文导游1.1-12.31价300元, 8.1-8.31价400元,如走团时间为8月,自动取400元。", "NewTitle": { "6": "", + "7": "官方景点名称,举例:陕西历史博物馆", + "8": "举例:故宫导游门票、上海外滩深度游导游补助", "B": "A点-B点(有疑议的需加往返/单程),举例:北京大兴机场-市区(单程)", "J": "A点-B点时长车费(有疑议的需加往返/单程),举例:张家界高铁站-市区(车费,单程)", "Q": "城市语种导游工资单位,举例:北京英语导游工资(元/天/团)", - "7": "官方景点名称,举例:陕西历史博物馆", "R": "普通餐标、豪华餐标、特色餐标,举例:普通餐标", - "8": "举例:故宫导游门票、上海外滩深度游导游补助", "D": "城市A点-B点时间包含内容,举例:北京市区一日游(车导)" } }, - "LgcModal": { "title": "添加语种", "placeholder": "选择语种" diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx index 8da780b..d0af5d4 100644 --- a/src/views/products/Audit.jsx +++ b/src/views/products/Audit.jsx @@ -72,13 +72,13 @@ const PriceTable = ({ productType, dataSource, refresh }) => { { key: 'groupSize', dataIndex: ['group_size_min'], - title: t('GroupSize'), + title: t('group_size'), render: (_, { group_size_min, group_size_max }) => `${group_size_min} - ${group_size_max}`, }, { key: 'useDates', dataIndex: ['use_dates_start'], - title: t('UseDates'), + title: t('use_dates'), render: (_, { use_dates_start, use_dates_end, weekdays }) => `${use_dates_start} ~ ${use_dates_end}`, // + (weekdays ? `, ${t('OnWeekdays')}${weekdays}` : ''), }, { key: 'weekdays', dataIndex: ['weekdays'], title: t('Weekdays'), render: (text, r) => text || t('Unlimited') },