diff --git a/src/App.vue b/src/App.vue
index a7ca0dc..6f90bb5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,12 @@ onBeforeMount(() => {
// 页面加载时
onMounted(() => {
nextTick(() => {
- Avue.locale.use(Local.get('langes') === 'zh-cn' ? zhLocale : enLocale)
+ if(!Local.get('langes')){
+ Avue.locale.use(zhLocale)
+ } else {
+ Avue.locale.use(Local.get('langes') === 'zh-cn' ? zhLocale : enLocale)
+ }
+
// eslint-disable-next-line no-mixed-spaces-and-tabs
// 监听布局配'置弹窗点击打开
mittBus.on('openSetingsDrawer', () => {
diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts
new file mode 100644
index 0000000..acbca7f
--- /dev/null
+++ b/src/i18n/pages/materialReceiptNotice/en.ts
@@ -0,0 +1,73 @@
+export default {
+ list:{
+ PONumber: "PO Number",
+ SupplierCode: "Supplier Code",
+ SupplierName: "Supplier Name",
+ Buyer: "Buyer",
+ SettlementMode: "Settlement Mode",
+ Currency: "Currency",
+ PaymentTerms: "Payment Terms",
+ ExchangeRateType: "Exchange Rate Type",
+ ExchangeRate: "Exchange Rate",
+ OrderCreater: "Order Creater",
+ DocStatus: "Doc Status",
+ PurchaseDate: "Purchase Date",
+ Comments: "Comments",
+ MaterialCode: "Material Code",
+ MaterialName: "Material Name",
+ Specification: "Specification",
+ PurchaseUnit: "Purchase Unit",
+ QTY: "QTY",
+ UP: "U/P",
+ TaxInclusiveUP: "Tax Inclusive U/P",
+ TotalAmount: "Total Amount (Tax-exclusive)",
+ TotalAmountTaxInclusive: "Total Amount (Tax-inclusive)",
+ AccumulatedReceiptQTY: "Accumulated Receipt QTY",
+ DemondDate: "Demond Date",
+ TaxAmount: "Tax Amount",
+ CommittedDeliveryDate: "Committed Delivery Date",
+ LatestCommittedDeliveryDate: "Latest Committed Delivery Date",
+ Comments2: "Comments",
+
+ // -- Part 2 --
+ PONumber2: "PO Number",
+ SupplierCode2: "Supplier Code",
+ SupplierName2: "Supplier Name",
+ Buyer2: "Buyer",
+ ReceiveOrg: "Receive Org",
+ BusinessType: "Business Type",
+ OrderCreator: "Order Creator",
+ DocStatus2: "Doc Status",
+ ReceivingDate: "Receiving Date",
+ Comments3: "Comments",
+ MaterialCode2: "Material Code",
+ MaterialName2: "Material Name",
+ Specification2: "Specification",
+ PurchaseUnit2: "Purchase Unit",
+ ActualReceiptQTY: "Actual Receipt QTY",
+ DeliveryQTY: "Delivery QTY",
+ SupplierLotNumber: "Supplier Lot Number",
+ QualifiedQTY: "Qualified QTY",
+ MaxcesLotNumber: "Maxces Lot Number",
+ Comments4: "Comments",
+
+ // -- Part 3 --
+ SourceDocNo: "Source Doc No.",
+ GoodReceivingNoticeNo: "Good Receiving Notice No.",
+ SupplierName3: "Supplier Name",
+ DeliveryDate2: "Delivery Date",
+ InvoiceNumber: "Invoice Number",
+ SN: "S/N",
+
+ // -- Other info --
+ SupplierName4: "Supplier Name",
+ UserName: "User Name",
+ MobileNumber: "Mobile Number",
+ AccountStatus: "Account Status",
+ Description: "Description",
+ CreatedDate: "Created Date",
+ Operation: "Operation",
+ PurchaseOrder: "Purchase Order",
+ DeliveryNote: "Delivery Note"
+ }
+};
diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts
new file mode 100644
index 0000000..e95e80b
--- /dev/null
+++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts
@@ -0,0 +1,73 @@
+export default {
+ list:{
+ PONumber: "单据编号",
+ SupplierCode: "供应商代码",
+ SupplierName: "供应商名称",
+ Buyer: "采购员",
+ SettlementMode: "结算方式",
+ Currency: "结算币别",
+ PaymentTerms: "付款条件",
+ ExchangeRateType: "汇率类型",
+ ExchangeRate: "汇率",
+ OrderCreater: "制单人",
+ DocStatus: "单据状态",
+ PurchaseDate: "采购日期",
+ Comments: "备注",
+ MaterialCode: "物料编码",
+ MaterialName: "物料名称",
+ Specification: "规格型号",
+ PurchaseUnit: "采购单位",
+ QTY: "数量",
+ UP: "单价",
+ TaxInclusiveUP: "含税单价",
+ TotalAmount: "金额（不含税）",
+ TotalAmountTaxInclusive: "价税合计（含税金额）",
+ AccumulatedReceiptQTY: "累计收料数量",
+ DemondDate: "交货日期",
+ TaxAmount: "税额",
+ CommittedDeliveryDate: "供应商承诺交期",
+ LatestCommittedDeliveryDate: "供应商承诺最新交期",
+ Comments2: "备注",
+
+ // -- 第二部分 --
+ PONumber2: "单据编号",
+ SupplierCode2: "供应商代码",
+ SupplierName2: "供应商名称",
+ Buyer2: "采购员",
+ ReceiveOrg: "收料组织",
+ BusinessType: "单据类型",
+ OrderCreator: "制单人",
+ DocStatus2: "单据状态",
+ ReceivingDate: "收料日期",
+ Comments3: "备注",
+ MaterialCode2: "物料编码",
+ MaterialName2: "物料名称",
+ Specification2: "规格型号",
+ PurchaseUnit2: "收料单位",
+ ActualReceiptQTY: "实到数量",
+ DeliveryQTY: "交货数量",
+ SupplierLotNumber: "供应商批号",
+ QualifiedQTY: "合格数量",
+ MaxcesLotNumber: "批号",
+ Comments4: "备注",
+
+ // -- 第三部分 --
+ SourceDocNo: "源单单号",
+ GoodReceivingNoticeNo: "收料通知单编号（送货单号）",
+ SupplierName3: "供应商名称",
+ DeliveryDate2: "送货日期",
+ InvoiceNumber: "发票号",
+ SN: "序号",
+
+ // -- 其他信息 --
+ SupplierName4: "公司名称",
+ UserName: "用户姓名",
+ MobileNumber: "手机号",
+ AccountStatus: "账号状态",
+ Description: "用户描述",
+ CreatedDate: "创建时间",
+ Operation: "操作",
+ PurchaseOrder: "采购订单",
+ DeliveryNote: "送货单"
+ }
+};
diff --git a/src/i18n/pages/materialReceiptNotice/zh-tw.ts b/src/i18n/pages/materialReceiptNotice/zh-tw.ts
new file mode 100644
index 0000000..8313794
--- /dev/null
+++ b/src/i18n/pages/materialReceiptNotice/zh-tw.ts
@@ -0,0 +1,4 @@
+// 定义内容
+export default {
+
+};
diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue
index ef296fd..8fdffee 100644
--- a/src/layout/navBars/topBar/user.vue
+++ b/src/layout/navBars/topBar/user.vue
@@ -24,7 +24,7 @@
简体中文
English
- 繁體中文
+
@@ -200,7 +200,7 @@ const onComponentSizeChange = (size: string) => {
window.location.reload();
};
// 语言切换
-const onLanguageChange = (lang: string) => {
+const onLanguageChange = (lang: string,stateVal:boolean = true) => {
Local.remove('themeConfig');
themeConfig.value.globalI18n = lang;
Local.set('themeConfig', themeConfig.value);
@@ -208,7 +208,7 @@ const onLanguageChange = (lang: string) => {
locale.value = lang;
other.useTitle();
initI18nOrSize('globalI18n', 'disabledI18n');
- router.go(0)
+ if (stateVal) router.go(0)
};
// 初始化组件大小/i18n
const initI18nOrSize = (value: string, attr: string) => {
@@ -220,6 +220,12 @@ onMounted(() => {
initI18nOrSize('globalComponentSize', 'disabledSize');
initI18nOrSize('globalI18n', 'disabledI18n');
}
+ if(Local.get('langes') === 'en') {
+ onLanguageChange('en' , false)
+ }
+ else {
+ onLanguageChange('zh-cn', false)
+ }
});
diff --git a/src/router/route.ts b/src/router/route.ts
index 0f1865e..910458b 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -52,7 +52,7 @@ export const dynamicRoutes: Array = [
name: 'mssPurchaseOrderIndex',
component: () => import('/@/views/mssPurchaseOrder/index.vue'),
meta: {
- title: '采购订单',
+ title: 'message.list.PurchaseOrder',
isLink: '',
isHide: false,
isKeepAlive: true,
@@ -67,11 +67,11 @@ export const dynamicRoutes: Array = [
name: 'purchaseDetails',
component: () => import('/@/views/mssPurchaseOrder/purchaseDetails.vue'),
meta: {
- title: '采购订单',
+ title: 'message.list.PurchaseOrder',
isLink: '',
isHide: true,
isKeepAlive: true,
- isAffix: true,
+ isAffix: false,
isIframe: false,
roles: ['admin', 'common'],
icon: 'iconfont icon-shouye',
@@ -82,11 +82,11 @@ export const dynamicRoutes: Array = [
name: 'materialReceiptNotice',
component: () => import('/@/views/materialReceiptNotice/index.vue'),
meta: {
- title: '收料通知单',
+ title: 'message.list.DeliveryNote',
isLink: '',
isHide: false,
isKeepAlive: true,
- isAffix: true,
+ isAffix: false,
isIframe: false,
roles: ['admin', 'common'],
icon: 'iconfont icon-shouye',
@@ -97,11 +97,11 @@ export const dynamicRoutes: Array = [
name: 'materialReceiptNoticePurchaseDetails',
component: () => import('/@/views/materialReceiptNotice/purchaseDetails.vue'),
meta: {
- title: '收料通知单',
+ title: 'message.list.DeliveryNote',
isLink: '',
isHide: true,
isKeepAlive: true,
- isAffix: true,
+ isAffix: false,
isIframe: false,
roles: ['admin', 'common'],
icon: 'iconfont icon-shouye',
diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts
index 3e8e683..37f3997 100644
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@@ -104,7 +104,7 @@ export const useThemeConfig = defineStore('themeConfig', {
// 是否开启水印
isWartermark: true,
// 水印文案
- wartermarkText: 'vue-next-admin',
+ wartermarkText: 'Maxcess SCEP',
/**
* 其它设置
@@ -137,11 +137,11 @@ export const useThemeConfig = defineStore('themeConfig', {
* 全局网站标题 / 副标题
*/
// 网站主标题（菜单导航、浏览器当前网页标题）
- globalTitle: 'vue-next-admin',
+ globalTitle: 'Maxcess SCEP',
// 网站副标题（登录页顶部文字）
- globalViceTitle: 'vueNextAdmin',
+ globalViceTitle: 'Maxcess SCEP',
// 网站副标题（登录页顶部文字）
- globalViceTitleMsg: '专注、免费、开源、维护、解疑',
+ globalViceTitleMsg: '',
// 默认初始语言，可选值""，默认 zh-cn
globalI18n: 'zh-cn',
// 默认全局组件大小，可选值""，默认 'large'
diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue
index c4f6776..26de11b 100644
--- a/src/views/materialReceiptNotice/index.vue
+++ b/src/views/materialReceiptNotice/index.vue
@@ -15,10 +15,13 @@