From 65775e1357468c9abcf29d212eb0669d8282bf7a Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期五, 11 四月 2025 16:38:40 +0800 Subject: [PATCH] fix:收货单字段修改 --- rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 5 +++-- rsf-admin/src/i18n/zh.js | 3 ++- rsf-admin/src/i18n/en.js | 1 + rsf-admin/.env | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rsf-admin/.env b/rsf-admin/.env index a3c69b2..a8ce658 100644 --- a/rsf-admin/.env +++ b/rsf-admin/.env @@ -1,3 +1,3 @@ -VITE_BASE_IP=127.0.0.1 +VITE_BASE_IP=192.168.4.24 # VITE_BASE_IP=47.76.147.249 VITE_BASE_PORT=8080 diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index c18734e..7afc39b 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -509,6 +509,7 @@ arrTime: "Arrived", rleStatus: "Release", ntyStatus: "Notify", + exceStatus: 'bill status' }, asnOrderItem: { asnId: "asnId", diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index f2bf06e..681bb53 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -516,8 +516,9 @@ qty: "瀹屾垚鏁伴噺", logisNo: "鐗╂祦鍗曞彿", arrTime: "棰勮鍒拌揪鏃堕棿", - rleStatus: "鐘舵��", + rleStatus: "閲婃斁鐘舵��", ntyStatus: "涓婃姤鐘舵��", + exceStatus: '鍗曟嵁鐘舵��' }, asnOrderItem: { asnId: "涓诲崟鏍囪瘑", diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx index ec50864..313e11b 100644 --- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx +++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx @@ -92,9 +92,10 @@ <TextInput label="common.field.memo" source="memo" />, <DictionarySelect - label='common.field.status' + label='table.field.asnOrder.exceStatus' name="exceStatus" dictTypeCode="sys_asn_exce_status" + alwaysOn />, ] @@ -167,7 +168,7 @@ <TextField source="nickname" /> </ReferenceField> <DateField source="createTime" label="common.field.createTime" showTime /> - <BillStatusField cellClassName="status" source="exceStatus" label="common.field.status" /> + <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt" width={300} > {/* <Button label="toolbar.print" onClick={print}> -- Gitblit v1.9.1