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/zh.js | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index afff7b2..e6e611d 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -129,9 +129,10 @@
loc: '鍩虹搴撲綅',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
- stockItem: '搴撳瓨鏄庣粏',
- stock: '搴撳瓨淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
+ dictType: '鏁版嵁瀛楀吀',
+ dictData: '瀛楀吀鏁版嵁闆�',
+ companys: '寰�鏉ヤ紒涓�',
},
@@ -337,43 +338,37 @@
name: "鍚嶇О",
projectName: "椤圭洰鍚嶇О",
},
- stock: {
- asnOrder: "搴撳瓨鍗曟嵁",
- erpToken: "ERP鍑瘉",
- erpOrder: "ERP鍗曟嵁",
- erpStkAdr: "ERP搴撳瓨鍦�",
- contractId: "鍚堝悓鏍囪瘑",
- lockReason: "鍔犻攣鍘熷洜",
- lockStatus: "鍔犺浇鐘舵��",
- locker: "鍔犻攣浜�",
- lockedTime: "鍔犻攣鏃堕棿",
- },
- stockItem: {
- stockId: "搴撳瓨鏍囪瘑",
- matnrId: "鐗╂枡鏍囪瘑",
- code: "鐗╂枡缂栫爜",
- matnrk: "鐗╂枡鍚嶇О",
- anfme: "鏁伴噺",
- workQty: "鎵ц涓暟閲�",
- qty: "宸插畬鎴愭暟閲�",
- weight: "閲嶉噺",
- unit: "鍗曚綅",
- shipperId: "璐т富",
- splrId: "渚涘簲鍟�",
- brand: "鍝佺墝",
- batch: "鎵规",
- prodTime: "鐢熶骇鏃ユ湡",
- inspectId: "璐ㄦ煡鏍囪瘑",
- splrBtch: "渚涘簲鍟嗘壒娆�",
- locId: "搴撲綅鏍囪瘑",
- barcode: "瀹瑰櫒缂栫爜",
- purPrice: "閲囪喘浠�",
- },
qlyInspect: {
code: "缂栫爜",
name: "鍚嶇О",
},
-
+ dictType: {
+ name: "瀛楀吀鍚嶇О",
+ description: "鍐呭鎻忚堪",
+ },
+ dictData: {
+ dictTypeId: "瀛楀吀鏍囪瘑",
+ dictTypeCode: "瀛楀吀缂栫爜",
+ value: "鍊�",
+ label: "鍒悕",
+ sort: "鎺掑簭",
+ color: "棰滆壊",
+ },
+ companys: {
+ code: "浼佷笟缂栫爜",
+ name: "鍚嶇О",
+ nameEn: "鑻辨枃鍒悕",
+ breifCode: "鍔╄鐮�",
+ type: "绫诲瀷",
+ contact: "鑱旂郴浜�",
+ tel: "鑱旂郴鐢佃瘽",
+ email: "鐢靛瓙閭欢",
+ pcode: "閭紪",
+ province: "鐪佷唤",
+ city: "鍩庡競",
+ address: "鍦板潃",
+ },
+
}
},
page: {
--
Gitblit v1.9.1