From d23eb6d53cb10362de2b961e77f45c27ec38196d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 15:03:46 +0800
Subject: [PATCH] #页面持久化

---
 rsf-admin/src/i18n/zh.js |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 4088f47..3d27ce7 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -202,7 +202,7 @@
         logs: '鏃ュ織',
         permissions: '鏉冮檺绠$悊',
         delivery: 'DO鍗�',
-        outStock: '鍑哄簱鍗�',
+        outStock: '鍑哄簱閫氱煡鍗�',
         outStockItem: '鍑哄簱鍗曟槑缁�',
         inStockPoces: '鍏ュ簱绠$悊',
         outStockPoces: '鍑哄簱绠$悊',
@@ -240,9 +240,28 @@
         taskPathTemplateNode: '浠诲姟璺緞妯℃澘鑺傜偣',
         subsystemFlowTemplate: '瀛愮郴缁熸祦绋嬫ā鏉�',
         flowStepTemplate: '娴佺▼姝ラ妯℃澘',
+        taskPathTemplateMerge: '浠诲姟璺緞妯℃澘鍚堝苟',
     },
     table: {
         field: {
+            taskPathTemplateMerge: {
+                templateCode: "妯℃澘缂栫爜",
+                templateName: "妯℃澘鍚嶇О",
+                sourceType: "婧愮被鍨�",
+                targetType: "鐩爣绫诲瀷",
+                conditionExpression: "鏉′欢琛ㄨ揪寮�",
+                conditionDesc: "鏉′欢鎻忚堪",
+                version: "鐗堟湰",
+                isCurrent: "鏄惁褰撳墠",
+                effectiveTime: "鐢熸晥鏃堕棿",
+                expireTime: "杩囨湡鏃堕棿",
+                priority: "浼樺厛绾�",
+                timeoutMinutes: "瓒呮椂鏃堕棿",
+                maxRetryTimes: "鏈�澶ч噸璇曟鏁�",
+                retryIntervalSeconds: "閲嶈瘯闂撮殧",
+                remark: "澶囨敞",
+                stepSize: "姝ラ暱",
+            },
             flowStepTemplate: {
                 flowId: "娴佺▼ID",
                 flowCode: "娴佺▼缂栫爜",
@@ -775,7 +794,7 @@
                 arrTime: "棰勮鍒拌揪鏃堕棿",
                 rleStatus: "閲婃斁鐘舵��",
                 ntyStatus: "涓婃姤鐘舵��",
-                exceStatus: '鍗曟嵁鐘舵��'
+                exceStatus: '鍗曟嵁鐘舵��',
             },
             checkOrder: {
                 code: "鐩樼偣鍗曞彿",
@@ -945,7 +964,10 @@
                 packName: "鍖呰",
                 ntyStatus: "鎶ユ鐘舵��",
                 prodTime: "鐢熶骇鏃ユ湡",
-                platItemId: '琛屽彿'
+                platItemId: '琛屽彿',
+                unit: '鍗曚綅',
+                targetWarehouseId: "浠撳簱",
+                sourceWarehouseId: "璋冨嚭浠�",
             },
             asnOrderLog: {
                 code: "鍗曟嵁缂栫爜",

--
Gitblit v1.9.1