From b68cf299e68473295dba11d94cc2e70a19dc673a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 15:50:06 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/i18n/zh.js | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 2487bfe..655f20e 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -134,6 +134,7 @@
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
dictData: '瀛楀吀鏁版嵁闆�',
companys: '寰�鏉ヤ紒涓�',
@@ -150,10 +151,10 @@
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
deviceSite: '绔欑偣绠＄悊',
- waitPakin: '缁勬墭淇℃伅',
- waitPakinItem: '缁勬墭淇℃伅鏄庣粏',
- waitPakinLog: '缁勬墭鍘嗗彶',
- waitPakinItemLog: '缁勬墭鍘嗗彶鏄庣粏',
+ waitPakin: '缁勬嫋閫氱煡妗�',
+ waitPakinItem: '缁勬嫋妗ｆ槑缁�',
+ waitPakinLog: '缁勬嫋鍘嗗彶妗�',
+ waitPakinItemLog: '缁勬嫋鍘嗗彶妗ｆ槑缁�',
},
table: {
field: {
@@ -417,26 +418,30 @@
projectName: "椤圭洰鍚嶇О",
},
qlyInspect: {
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
code: "缂栫爜",
- wkType: "wkType",
+ wkType: "涓氬姟绫诲瀷",
safeQty: "鍚堟牸鏁伴噺",
- dlyQty: "dlyQty",
- rcptQty: "rcptQty",
- isptQty: "isptQty",
+ dlyQty: "閫佽揣鏁伴噺",
+ rcptQty: "鏀惰揣鏁伴噺 ",
+ isptQty: "璐ㄦ鏁伴噺",
+ isptStatus: "璐ㄦ鐘舵��",
},
qlyIsptItem: {
- ispectId: "ispectId",
- matnrCode: "matnrCode",
- maktx: "maktx",
- label: "label",
- splrName: "splrName",
- splrBatch: "splrBatch",
- stockBatch: "stockBatch",
- rcptQty: "rcptQty",
- dlyQty: "dlyQty",
- disQty: "disQty",
- safeQty: "safeQty",
- picPath: "picPath",
+ ispectId: "涓诲崟ID",
+ matnrCode: "缂栧彿",
+ maktx: "鐗╂枡鍚嶇О",
+ label: "鏍囩",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ stockBatch: "搴撳瓨鎵规",
+ isptResult: '璐ㄦ缁撹',
+ rcptQty: "鏀惰揣鏁伴噺",
+ dlyQty: "閫佽揣鏁伴噺",
+ disQty: "涓嶅悎鏁伴噺",
+ safeQty: "鍚堟牸鏁伴噺",
+ picPath: "鍥剧墖璺緞",
},
dictType: {
code: "瀛楀吀缂栫爜",
@@ -493,7 +498,7 @@
maxWeight: "鏈�澶ч噸閲�",
},
asnOrder: {
- code: "缂栫爜",
+ code: "ASN鍗曞彿",
poCode: "PO缂栫爜",
poId: "PO鏍囪瘑",
type: "鍗曟嵁绫诲瀷",
@@ -512,6 +517,7 @@
poDetlCode: "PO鍗曠紪鐮�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
+ maktxCode: "鐗╂枡缂栫爜",
anfme: "鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
purQty: "璁″垝鏀惰揣鏁伴噺",
@@ -622,7 +628,7 @@
code: "缂栫爜",
ansId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
- barcode: "鏉″舰鐮�",
+ barcode: "瀹瑰櫒鐮�",
anfme: "鏁伴噺",
ioStatus: "鐘舵��",
},
@@ -631,6 +637,10 @@
maktx: "鐗╂枡",
matnrId: "鐗╂枡id",
matnrCode: "鐗╂枡缂栫爜",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
+ asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
+ asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
+ trackCode: "鏉″舰鐮�",
anfme: "鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
@@ -641,14 +651,14 @@
waitPakinLog: {
pakinId: "缁勬墭Id",
code: "缂栫爜",
- barcode: "鏉″舰鐮�",
+ barcode: "瀹瑰櫒鐮�",
anfme: "鏁伴噺",
ioStatus: "鐘舵��",
},
waitPakinItemLog: {
pakinId: "缁勬墭Id",
pakinItemId: "缁勬墭鏄庣粏Id",
- ansId: "鏀惰揣閫氱煡鍗曞彿",
+ asnId: "鏀惰揣閫氱煡鍗曞彿",
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
@@ -762,6 +772,10 @@
batchWarehouseAreas: "鎵归噺搴撳尯",
batchLocType: "鎵归噺搴撲綅绫诲瀷",
batchPrint: "鎵归噺鎵撳嵃",
+ quality: "璐ㄦ",
+ complete: "瀹屾垚",
+ close: "鍏抽棴",
+ asnCreate: "閫氳繃ASN鍒涘缓",
},
};
--
Gitblit v1.9.1