From 37e8e06c8d13146e62ef08d018d86443b9f42f00 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 二月 2025 14:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/en.js | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 634a934..63c3dcd 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -129,7 +129,13 @@
loc: 'Loc',
container: 'Container',
contract: 'Contract',
- stockItem: 'StockItem',
+ qlyInspect: 'QlyInspect',
+ dictType: 'DictType',
+ dictData: 'DictData',
+ companys: 'Companys',
+
+
+
},
table: {
field: {
@@ -332,34 +338,35 @@
name: "Name",
projectName: "ProjectName",
},
- stockItem: {
- stockId: "stockId",
- matnrId: "matnrId",
+ qlyInspect: {
code: "code",
- matnrk: "matnrk",
- anfme: "anfme",
- workQty: "workQty",
- qty: "qty",
- weight: "weight",
- unit: "unit",
- shipperId: "shipperId",
- splrId: "splrId",
- brand: "brand",
- batch: "batch",
- prodTime: "prodTime",
- inspectId: "inspectId",
- splrBtch: "splrBtch",
- asnOrder: "asnOrder",
- erpToken: "erpToken",
- erpOrder: "erpOrder",
- erpStkAdr: "erpStkAdr",
- locId: "locId",
- barcode: "barcode",
- purPrice: "purPrice",
- lockReason: "lockReason",
- lockStatus: "lockStatus",
- locker: "locker",
- lockedTime: "lockedTime",
+ name: "name",
+ },
+ dictType: {
+ name: "name",
+ description: "description",
+ },
+ dictData: {
+ dictTypeId: "dictTypeId",
+ dictTypeCode: "dictTypeCode",
+ value: "value",
+ label: "label",
+ sort: "sort",
+ color: "color",
+ },
+ companys: {
+ code: "Code",
+ name: "Name",
+ nameEn: "NameEn",
+ breifCode: "BreifCode",
+ type: "Type",
+ contact: "Contact",
+ tel: "Tel",
+ email: "Email",
+ pcode: "PCode",
+ province: "Province",
+ city: "City",
+ address: "Address",
},
}
},
--
Gitblit v1.9.1