From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 88563f3..0627434 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -168,7 +168,7 @@
<TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
<NumberField source="anfme" label="table.field.asnOrder.anfme" />
<NumberField source="qty" label="table.field.asnOrder.qty" />
- <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
+ {/* <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> */}
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
<TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" />
@@ -183,7 +183,7 @@
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
<InspectionButton />
<CompleteButton />
- <DeleteButton mutationMode="pessimistic" />
+ <ODeleteButton />
{/* <CloseButton /> */}
</WrapperField>
</StyledDatagrid>
@@ -207,9 +207,8 @@
const ODeleteButton = () => {
const record = useRecordContext();
-
return (
- record.exceStatus === 0 ? <DeleteButton /> : <></>
+ record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic"/> : <></>
)
}
@@ -224,6 +223,7 @@
};
return (
+ record.exceStatus === 1 || record.exceStatus === 0 ?
<Button
color="primary"
startIcon={<EditIcon />}
@@ -232,6 +232,7 @@
label={'ra.action.edit'}
>
</Button>
+ : <></>
)
}
--
Gitblit v1.9.1