From 632bb5a9a0f07c01ffba53e9009d69c4a50c2bd7 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 12:50:01 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 889ea39..f2ae4ea 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -127,6 +127,8 @@
warehouse: '浠撳簱淇℃伅',
warehouseAreas: '浠撳簱搴撳尯',
loc: '鍩虹搴撲綅',
+ locType: '搴撲綅绫诲瀷',
+ locArea: '閫昏緫鍒嗗尯',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
@@ -297,6 +299,7 @@
warehouseAreas: {
uuid: "鍞竴缂栫爜",
name: "鍚嶇О",
+ wareId: "浠撳簱",
code: "缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
@@ -352,8 +355,19 @@
startBay: "璧峰鍒�",
startLev: "璧峰灞�",
startRow: "璧峰鎺�",
+ useStatus: '搴撲綅鐘舵��'
},
-
+ locType: {
+ name: "搴撲綅绫诲瀷",
+ code: "缂栧彿",
+ regex: "瑙勫垯琛ㄨ揪寮�",
+ },
+ locArea: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ areaId: "搴撳尯",
+ locId: "搴撲綅",
+ },
container: {
code: "缂栫爜",
name: "鍚嶇О",
@@ -611,7 +625,9 @@
print: "鎵撳嵃",
enable: '鍚敤',
unenable: '绂佺敤',
- locInit: '聽搴撲綅鍒濆鍖�'
+ locInit: '聽搴撲綅鍒濆鍖�',
+ batch: '鎵归噺鎿嶄綔',
+ confirm: '纭',
},
};
--
Gitblit v1.9.1