diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json index 65ce12b..a728a5a 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/resources/json/customer_menu.json @@ -2,7 +2,7 @@ { "id": 2804, "parentId": 0, - "name": "订单管理", + "name": "order.ordermanage", "path": "/order", "component": "", "componentName": "", @@ -14,7 +14,7 @@ { "id": 2830, "parentId": 2828, - "name": "我的订单", + "name": "order.myorder", "path": "sale-order", "component": "oms/saleorder/index", "componentName": "SaleOrder", @@ -27,7 +27,7 @@ { "id": 2818, "parentId": 2804, - "name": "创建订单", + "name": "order.createorder", "path": "createorder", "component": "oms/order/createorder/index", "componentName": "CreateOrder", diff --git a/hangtag-ui/hangtag-ui-front/src/hooks/web/useTitle.ts b/hangtag-ui/hangtag-ui-front/src/hooks/web/useTitle.ts index 020a9b7..3d58080 100644 --- a/hangtag-ui/hangtag-ui-front/src/hooks/web/useTitle.ts +++ b/hangtag-ui/hangtag-ui-front/src/hooks/web/useTitle.ts @@ -3,11 +3,11 @@ import { isString } from '@/utils/is' import { useAppStoreWithOut } from '@/store/modules/app' const appStore = useAppStoreWithOut() - +const { t } = useI18n() export const useTitle = (newTitle?: string) => { const { t } = useI18n() const title = ref( - newTitle ? `${appStore.getTitle} - ${t(newTitle as string)}` : appStore.getTitle + newTitle ? t('omsSystem.title') + ` - ${t(newTitle as string)}` : t('omsSystem.title') ) watch( diff --git a/hangtag-ui/hangtag-ui-front/src/layout/components/Footer/src/Footer.vue b/hangtag-ui/hangtag-ui-front/src/layout/components/Footer/src/Footer.vue index 3eede38..e7b4062 100644 --- a/hangtag-ui/hangtag-ui-front/src/layout/components/Footer/src/Footer.vue +++ b/hangtag-ui/hangtag-ui-front/src/layout/components/Footer/src/Footer.vue @@ -8,7 +8,7 @@ defineOptions({ name: 'Footer' }) const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('footer') - +const { t } = useI18n() const appStore = useAppStore() const title = computed(() => appStore.getTitle) @@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle) :class="prefixCls" class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]" > - Copyright ©2022-{{ title }} + Copyright ©2022-{{ t('omsSystem.title') }} diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts index 4760a26..f073693 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts @@ -207,6 +207,7 @@ export default { toDo: 'To do', introduction: 'A serious introduction', shortcutOperation: 'Quick entry', + operationData: 'Operation Data', operation: 'Operation', index: 'Index', personal: 'Personal', @@ -465,4 +466,83 @@ export default { auditTips: 'This manuscript is only used for content verification and will not be used as the final printed manuscript;', cancelText: 'Cancel', }, + order:{ + ordermanage:'Order Manage', + myorder:'My Order', + createorder:'Create Order' + }, + orderstatus:{ + rejectedOrder:'Rejected Order', + waitAuditOrder:'Wait Audit Order', + waitArrangeOrder:'Wait Arrange Order', + }, + omsSystem: { + title:'Silver Pringting OMS' + }, + billform:{ + pleaseenter:'pleaseenter ', + pleaseselect:'pleaseselect ', + startdate:'startdate', + enddate:'enddate', + }, + billlist:{ + search:'Search', + reset:'Reset', + cancel:'Cancel', + submit:'Submit', + export:'Export', + all:'All', + waitAudit:'Wait Audit', + waitArrange:'Wait Arrange', + planned:'Planned', + edit:'edit', + details:'details', + operate:'operate', + }, + saleorder:{ + title:{ + details:'OrderDetails', + remarks:'remarks', + orderinfo:'OrderInfo', + orderstatus:'OrderStatus', + productinfo:'ProductInfo', + invoiceinfo:'InvoiceInfo', + billinfo:'BillInfo', + }, + billno:'orderNo', + customer:'customer', + salesperson:'salesPerson', + followUpPerson:'followUpPerson', + bizdate:'bizdate', + confirmdate:'confirmdate', + plandate:'plandate', + orderstatus:'orderstatus', + phone:'phone', + remark:'remark', + contractType:'contractType', + emails:'emails', + fax:'fax', + customerCompany:'customerCompany', + customerNumber:'customerNumber', + customerName:'customerName', + currencyType:'currencyType', + invoiceCode:'invoiceCode', + invoiceName:'invoiceName', + invoiceAddress:'invoiceAddress', + invoiceRemarks:'invoiceRemarks', + createTime:'createTime', + updaterName:'updaterName', + updateTime:'updateTime', + auditorName:'auditorName', + auditorTime:'auditorTime', + entry:{ + productNumber:'productNumber', + productName:'productName', + productSpec:'productSpec', + qty:'qty', + price:'price', + discount:'discount', + amount:'amount', + } + } } diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts index eed7a1e..b9ee0e3 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts @@ -208,6 +208,7 @@ export default { toDo: '待办', introduction: '一个正经的简介', shortcutOperation: '快捷入口', + operationData: '运营数据', operation: '操作', index: '指数', personal: '个人', @@ -460,4 +461,84 @@ export default { cancelText: '取消', }, 'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时,一直 warn 报错 + , + order:{ + ordermanage:'订单管理', + myorder:'我的订单', + createorder:'创建订单' + }, + orderstatus:{ + rejectedOrder:'已驳回订单', + waitAuditOrder:'待审核订单', + waitArrangeOrder:'待排产订单', + }, + omsSystem: { + title:'嘉晋OMS下单系统' + }, + billform:{ + pleaseenter:'请输入', + pleaseselect:'请选择', + startdate:'开始日期', + enddate:'结束日期', + }, + billlist:{ + search:'搜索', + reset:'重置', + cancel:'作废', + submit:'提交', + export:'导出', + all:'全部', + waitAudit:'待审核', + waitArrange:'待排产', + planned:'已排产', + edit:'编辑', + details:'详情', + operate:'操作', + }, + saleorder:{ + title:{ + details:'订单详情', + remarks:'备注', + orderinfo:'订单信息', + orderstatus:'订单状态', + productinfo:'产品信息', + invoiceinfo:'发票信息', + billinfo:'制单信息', + }, + billno:'订单号', + customer:'客户', + salesperson:'销售员', + followUpPerson:'跟单员', + bizdate:'业务日期', + confirmdate:'确认日期', + plandate:'计划日期', + orderstatus:'订单状态', + phone:'手机', + remark:'备注', + contractType:'合约类型', + emails:'邮箱', + fax:'传真', + customerCompany:'客户公司', + customerNumber:'客户编号', + customerName:'客户名称', + currencyType:'结算币种', + invoiceCode:'发票抬头', + invoiceName:'发票名称', + invoiceAddress:'发票地址', + invoiceRemarks:'发票备注', + createTime:'创建时间', + updaterName:'修改人', + updateTime:'修改时间', + auditorName:'审核人', + auditorTime:'审核时间', + entry:{ + productNumber:'产品编码', + productName:'产品名称', + productSpec:'产品规格', + qty:'数量', + price:'单价', + discount:'折扣', + amount:'金额', + } + } } diff --git a/hangtag-ui/hangtag-ui-front/src/router/modules/remaining.ts b/hangtag-ui/hangtag-ui-front/src/router/modules/remaining.ts index 7591919..e674106 100644 --- a/hangtag-ui/hangtag-ui-front/src/router/modules/remaining.ts +++ b/hangtag-ui/hangtag-ui-front/src/router/modules/remaining.ts @@ -257,7 +257,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ component: () => import('@/views/oms/saleorder/detail/index.vue'), name: 'SaleOrderDetail', meta: { - title: '订单详情', + title: t('saleorder.title.details'), icon: 'ep:view', activeMenu: '/oms/saleorder' } diff --git a/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue index 10ebe0d..d16a411 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/Home/components/OperationDataCard.vue @@ -1,7 +1,7 @@