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 |   95 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 0d2fe64..ab3b631 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',
+        serialRuleItem: 'SerialRuleItem',
+        serialRule: 'SerialRule',
+
     },
     table: {
         field: {
@@ -332,34 +338,53 @@
                 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: {
+                code: "Code",
+                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",
+            },
+            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",
             },
         }
     },
@@ -417,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