From e34cc8847f742e08106fae37fdf1dd91cd0aa170 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 12:56:20 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx | 1 +
rsf-admin/src/page/basicInfo/companys/CompanysList.jsx | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index f752537..b83a522 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
@@ -74,7 +74,7 @@
{ id: 'customer', name: 'common.field.customer' },
{ id: 'supplier', name: 'common.field.supplier' },
{ id: 'partners', name: 'common.field.partners' }
- ]} />,
+ ]} alwaysOn />,
<TextInput source="contact" label="table.field.companys.contact" />,
<TextInput source="tel" label="table.field.companys.tel" />,
<TextInput source="email" label="table.field.companys.email" />,
diff --git a/rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx b/rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx
index 8c10825..f150390 100644
--- a/rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx
@@ -182,6 +182,7 @@
onChange={(e) => handleChange(e.target.value, 'flagCheck')}
label="table.field.matnr.flagCheck"
source="flagCheck"
+ defaultValue={1}
choices={[
{ id: 0, name: ' 鍚�' },
{ id: 1, name: ' 鏄�' },
--
Gitblit v1.9.1