From 1c502c82c188292fd8c9337c221e1f09a86a642b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 13:34:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/CheckOrderEdit.jsx | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx b/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
index 0844f23..dea9aa5 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
@@ -21,8 +21,8 @@
const CheckOrderEdit = () => {
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 dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_order_type' && dict.group == 3)) || [];
+ const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_check_order_type')) || [];
return (
<>
@@ -66,12 +66,6 @@
readOnly
parse={v => v}
/>
- <TextInput
- label="table.field.outStock.poCode"
- source="poCode"
- readOnly
- parse={v => v}
- />
<AutocompleteInput
choices={dicts}
optionText="label"
@@ -105,8 +99,8 @@
parse={v => v}
/>
<TextInput
- label="table.field.outStock.qty"
- source="qty"
+ label="table.field.outStock.workQty"
+ source="workQty"
readOnly
parse={v => v}
/>
--
Gitblit v1.9.1