From c0b3ad18633abfabd96b70bb2de7c8b3095cd48b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 17:36:30 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/deviceBind/DeviceBindList.jsx | 4 +
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx | 8 +++-
rsf-admin/src/page/components/DictionarySelect.jsx | 55 +++++++++++++++++++--------
rsf-admin/src/i18n/core/chineseMessages.js | 2
rsf-admin/src/i18n/zh.js | 2
5 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/i18n/core/chineseMessages.js b/rsf-admin/src/i18n/core/chineseMessages.js
index eeb4c53..d61dfd5 100644
--- a/rsf-admin/src/i18n/core/chineseMessages.js
+++ b/rsf-admin/src/i18n/core/chineseMessages.js
@@ -102,7 +102,7 @@
not_found: "Either you typed a wrong URL, or you followed a bad link.",
yes: "Yes",
unsaved_changes:
- "Some of your changes weren't saved. Are you sure you want to ignore them?",
+ "鎮ㄦ墍鍋氱殑閮ㄥ垎鏇存敼灏氭湭淇濆瓨銆傜‘瀹氳蹇界暐杩欎簺鏇存敼鍚楋紵",
},
navigation: {
no_results: "娌℃湁鎵惧埌鏁版嵁",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index bbbc8b9..f229ecc 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -157,7 +157,7 @@
fields: '鎵╁睍瀛楁',
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
- deviceSite: '绔欑偣绠＄悊',
+ deviceSite: '璺緞绠＄悊',
waitPakin: '缁勬嫋閫氱煡妗�',
waitPakinItem: '缁勬嫋妗ｆ槑缁�',
waitPakinLog: '缁勬嫋鍘嗗彶妗�',
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
index d87e88a..13241e2 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
@@ -69,9 +69,13 @@
label={translate("table.field.deviceSite.type")}
name="type"
validate={[required()]}
- dictTypeCode="sys_task_type"
+ dictTypeCode="sys_task_type"
multiple
- />
+ perPage={REFERENCE_INPUT_PAGESIZE}
+ pagination={true}
+ sort={{ field: 'id', order: 'ASC' }}
+ filter={{ active: true }}
+ />
</Stack>
<Stack direction='row' gap={2}>
<TextInput
diff --git a/rsf-admin/src/page/components/DictionarySelect.jsx b/rsf-admin/src/page/components/DictionarySelect.jsx
index 0eb2fab..0825280 100644
--- a/rsf-admin/src/page/components/DictionarySelect.jsx
+++ b/rsf-admin/src/page/components/DictionarySelect.jsx
@@ -8,38 +8,59 @@
import request from '@/utils/request';
const DictionarySelect = (props) => {
- const { dictTypeCode, name, multiple = false, ...parmas } = props;
+ const {
+ dictTypeCode,
+ name,
+ multiple = false,
+ perPage = 100, // 榛樿姣忛〉鏄剧ず100鏉℃暟鎹�
+ page = 1, // 榛樿绗竴椤�
+ ...parmas
+ } = props;
const translate = useTranslate();
const notify = useNotify();
- const [list, setList] = useState([])
+ const [list, setList] = useState([]);
+ const [loading, setLoading] = useState(false);
useEffect(() => {
- http()
- }, [dictTypeCode]);
+ http();
+ }, [dictTypeCode, page, perPage]);
const http = async () => {
- const res = await request.post('/dictData/page', { dictTypeCode });
- if (res?.data?.code === 200) {
-
- setList(res.data.data.records.map((item) => {
- return {
- id: item.value,
- name: item.label
- }
- }))
- } else {
- notify(res.data.msg);
+ setLoading(true);
+ try {
+ const res = await request.post('/dictData/page', {
+ dictTypeCode,
+ current: page,
+ pageSize: perPage
+ });
+
+ if (res?.data?.code === 200) {
+ setList(res.data.data.records.map((item) => {
+ return {
+ id: item.value,
+ name: item.label
+ }
+ }));
+ } else {
+ notify(res.data.msg);
+ }
+ } catch (error) {
+ notify('鍔犺浇瀛楀吀鏁版嵁澶辫触', 'error');
+ console.error('鍔犺浇瀛楀吀鏁版嵁澶辫触:', error);
+ } finally {
+ setLoading(false);
}
- }
+ };
+
const InputComponent = multiple ? SelectArrayInput : SelectInput;
return (
<InputComponent
source={name}
choices={list}
+ isLoading={loading}
{...parmas}
/>
-
);
};
diff --git a/rsf-admin/src/page/deviceBind/DeviceBindList.jsx b/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
index 7b47945..795fb55 100644
--- a/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
+++ b/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
@@ -133,7 +133,9 @@
<NumberField source="startDeviceNo" label="table.field.deviceBind.startDeviceNo" />
<NumberField source="endDeviceNo" label="table.field.deviceBind.endDeviceNo" />
<TextField source="staList" label="table.field.deviceBind.staList" />
- <NumberField source="typeId" label="table.field.deviceBind.typeId" />
+ <ReferenceField source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
<TextField source="beSimilar" label="table.field.deviceBind.beSimilar" />
<TextField source="emptySimilar" label="table.field.deviceBind.emptySimilar" />
--
Gitblit v1.9.1