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/en.js |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index daf2177..a9d204c 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -9,6 +9,9 @@
             fail: "Fail",
             dataError: "Submit data was error, Please check",
         },
+        button: {
+            edit: "Edit",
+        },
         field: {
             id: 'ID',
             uuid: 'uuid',
@@ -134,7 +137,7 @@
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
-        qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
+        qlyIsptItem: 'qlyIsptItem',
         dictType: 'DictType',
         dictData: 'DictData',
         companys: 'Companys',
@@ -422,6 +425,7 @@
                 dlyQty: "dlyQty",
                 rcptQty: "rcptQty",
                 isptQty: "isptQty",
+                isptResult: "isptResult",
                 isptStatus: "isptStatus",
             },
             qlyIsptItem: {
@@ -506,6 +510,7 @@
                 arrTime: "Arrived",
                 rleStatus: "Release",
                 ntyStatus: "Notify",
+                exceStatus: 'bill status'
             },
             asnOrderItem: {
                 asnId: "asnId",

--
Gitblit v1.9.1