From a11e93f691f128763fa3c441f0936abec7a9655e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 16:38:47 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index e9adaaa..26d7d70 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
/>,
]
@@ -160,7 +161,7 @@
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<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