From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/en.js | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 01d776a..921ae49 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -106,7 +106,9 @@
},
menu: {
dashboard: 'Dashboard',
+ basicInfo: 'BasicInfo',
settings: 'Settings',
+ basicInfo: 'BasicInfo',
system: 'System',
user: 'User',
role: 'Role',
@@ -122,6 +124,8 @@
shipper: 'shipper',
matnr: 'Matnr',
matnrGroup: 'MatnrGroup',
+ warehouse: 'Warehouse',
+ warehouseAreas: 'WarehouseAreas',
},
table: {
@@ -236,7 +240,7 @@
code: "code",
shipperId: "shipperId",
groupId: "groupId",
- batchRegularId: "batchRegularId",
+ rglarId: "RegularId",
erpCode: "erpCode",
spec: "spec",
model: "model",
@@ -246,16 +250,16 @@
describle: "describle",
nromNum: "nromNum",
unit: "unit",
- purchaseUnit: "purchaseUnit",
+ purUnit: "purchaseUnit",
stockUnit: "stockUnit",
- stockLeval: "stockLeval",
+ stockLevel: "stockLeval",
isLabelMange: "isLabelMange",
- safetyQty: "safetyQty",
+ safeQty: "safetyQty",
minQty: "minQty",
maxQty: "maxQty",
- stagnate: "stagnate",
- validity: "validity",
- validityWarr: "validityWarr",
+ stagn: "stagnate",
+ valid: "validity",
+ validWarn: "validityWarn",
flagCheck: "flagCheck",
},
matnrGroup: {
@@ -263,6 +267,27 @@
code: "code",
parentId: "parentId",
},
+ warehouse: {
+ name: "name",
+ code: "code",
+ factory: "factory",
+ address: "address",
+ longitude: "longitude",
+ latgitude: "latgitude",
+ length: "length",
+ width: "width",
+ height: "height",
+ },
+ warehouseAreas: {
+ uuid: "uuid",
+ name: "name",
+ code: "code",
+ shipperId: "shipperId",
+ supplierId: "supplierId",
+ flagMinus: "flagMinus",
+ flagLabelMange: "flagLabelMange",
+ flagMix: "flagMix",
+ },
}
},
page: {
--
Gitblit v1.9.1