From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx b/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
index 49867b9..d619b4d 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
@@ -44,7 +44,7 @@
const DeliveryEdit = () => {
const translate = useTranslate();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_order_type')) || [];
- const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+ const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type' && dict.group == 2)) || [];
return (
<>
@@ -73,11 +73,6 @@
parse={v => v}
autoFocus
/>
- <TextInput
- label="table.field.delivery.platId"
- source="platId"
- parse={v => v}
- />
<AutocompleteInput
choices={dicts}
optionText="label"
@@ -95,14 +90,14 @@
optionValue="value"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.delivery.source"
source="source"
parse={v => v}
validate={required()}
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
<NumberInput
label="table.field.delivery.anfme"
source="anfme"
@@ -117,6 +112,11 @@
source="workQty"
/>
<TextInput
+ label="table.field.delivery.platId"
+ source="platId"
+ parse={v => v}
+ />
+ <TextInput
label="table.field.delivery.platCode"
source="platCode"
parse={v => v}
--
Gitblit v1.9.1