From 7a7e7117abe02043864d8737b3dbd4e6f2c51fa6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 二月 2025 13:04:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/i18n/en.js | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 070ab41..ab3b631 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -133,8 +133,8 @@
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
-
-
+ serialRuleItem: 'SerialRuleItem',
+ serialRule: 'SerialRule',
},
table: {
@@ -343,8 +343,9 @@
name: "name",
},
dictType: {
- name: "name",
- description: "description",
+ code: "Code",
+ name: "Name",
+ description: "Description",
},
dictData: {
dictTypeId: "dictTypeId",
@@ -367,6 +368,23 @@
province: "Province",
city: "City",
address: "Address",
+ },
+ serialRuleItem: {
+ ruleId: "ruleId",
+ wkType: "wkType",
+ feildValue: "feildValue",
+ len: "len",
+ lenStr: "lenStr",
+ sort: "sort",
+ },
+ serialRule: {
+ code: "code",
+ name: "name",
+ delimit: "delimit",
+ reset: "reset",
+ resetDep: "resetDep",
+ currValue: "currValue",
+ lastCode: "lastCode",
},
}
},
@@ -424,6 +442,20 @@
},
},
},
+ matnr: {
+ title: {
+ basic: 'basic info',
+ control: 'control',
+ batchRole: 'batch role',
+ }
+ },
+
+ },
+ form: {
+ matnr: {
+ shipper: 'shipper is required',
+ groupId: 'groupId is required',
+ }
}
};
--
Gitblit v1.9.1