From 766c38fe0e8a7ba9ae62b5d6113e13b9df2707db Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 14:09:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index e1546a9..d1e20f5 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -9,6 +9,9 @@
             fail: "鏈嶅姟鍣ㄩ敊璇�",
             dataError: "鏁版嵁閿欒锛岃浠旂粏妫�鏌�",
         },
+        button: {
+            edit: "缂栬緫",
+        },
         field: {
             id: 'ID',
             uuid: '缂栧彿',
@@ -430,6 +433,7 @@
                 dlyQty: "閫佽揣鏁伴噺",
                 rcptQty: "鏀惰揣鏁伴噺	",
                 isptQty: "璐ㄦ鏁伴噺",
+                isptResult: "璐ㄦ缁撴灉",
                 isptStatus: "璐ㄦ鐘舵��",
             },
             qlyIsptItem: {
@@ -513,8 +517,9 @@
                 qty: "瀹屾垚鏁伴噺",
                 logisNo: "鐗╂祦鍗曞彿",
                 arrTime: "棰勮鍒拌揪鏃堕棿",
-                rleStatus: "鐘舵��",
+                rleStatus: "閲婃斁鐘舵��",
                 ntyStatus: "涓婃姤鐘舵��",
+                exceStatus: '鍗曟嵁鐘舵��'
             },
             asnOrderItem: {
                 asnId: "涓诲崟鏍囪瘑",

--
Gitblit v1.9.1