From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index cb67494..db033ef 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -28,6 +28,8 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
+import DictionarySelect from "../components/DictionarySelect";
+import DictSelect from "../components/DictSelect";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -86,13 +88,11 @@
validate={[required()]}
parse={v => v}
/>
- <AutocompleteInput
- choices={dicts}
- optionText="label"
- label="table.field.asnOrder.type"
- source="type"
- optionValue="value"
- parse={v => v}
+ <DictionarySelect
+ label='table.field.warehouseAreas.type'
+ name="type"
+ dictTypeCode="sys_ware_areas_type"
+ alwaysOn
/>
<ReferenceInput
source="warehouseId"
@@ -101,6 +101,7 @@
<AutocompleteInput
label="table.field.warehouseAreas.wareId"
optionText="name"
+ optionValue="id"
validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
--
Gitblit v1.9.1