From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

---
 rsf-admin/src/page/locItem/LocItemList.jsx |   40 +++++++++++++++++-----------------------
 1 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/rsf-admin/src/page/locItem/LocItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
index 95821c1..7b4aa44 100644
--- a/rsf-admin/src/page/locItem/LocItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -54,15 +54,14 @@
     '& .column-name': {
     },
     '& .opt': {
-        width: 200
+        width: 100
     },
 }));
 
 const filters = [
     <SearchInput source="condition" alwaysOn />,
-    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
-    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
+    <DateInput label='common.time.after' source="timeStart" />,
+    <DateInput label='common.time.before' source="timeEnd" />,
     <NumberInput source="locId" label="table.field.locItem.locId" />,
     <TextInput source="locCode" label="table.field.locItem.locCode" />,
     <NumberInput source="orderId" label="table.field.locItem.orderId" />,
@@ -82,7 +81,6 @@
     <TextInput source="spec" label="table.field.locItem.spec" />,
     <TextInput source="model" label="table.field.locItem.model" />,
     <TextInput source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
-
     <TextInput label="common.field.memo" source="memo" />,
     <SelectInput
         label="common.field.status"
@@ -113,15 +111,15 @@
                     marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                 }}
                 title={"menu.locItem"}
-                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+                empty={false}
                 filters={filters}
                 sort={{ field: "create_time", order: "desc" }}
                 actions={(
                     <TopToolbar>
                         <FilterButton />
-                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+                        {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
                         <SelectColumnsButton preferenceKey='locItem' />
-                        <MyExportButton />
+                        {/* <MyExportButton /> */}
                     </TopToolbar>
                 )}
                 perPage={DEFAULT_PAGE_SIZE}
@@ -129,43 +127,39 @@
                 <StyledDatagrid
                     preferenceKey='locItem'
                     bulkActionButtons={false}
-                    rowClick={(id, resource, record) => false}
+                    rowClick={false}
                     expand={() => <LocItemPanel />}
                     expandSingle={true}
-                    omit={['id', 'createTime','locId','workQty','qty', 'createBy', 'memo','fieldsIndex','opt']}
+                    omit={['id', 'createTime','locId','orderId', 'orderItemId', 'matnrId', 'splrBatch','workQty','qty', 'createBy', 'memo','fieldsIndex']}
                    
                 >
                     <NumberField source="id" />
                     <NumberField source="locId" label="table.field.locItem.locId" />
                     <TextField source="locCode" label="table.field.locItem.locCode" />
                     <NumberField source="orderId" label="table.field.locItem.orderId" />
-                    <TextField source="type" label="table.field.locItem.type" />
+                    <TextField source="type$" label="table.field.locItem.type" />
                     <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />
-                    <NumberField source="wkType" label="table.field.locItem.wkType" />
+                    <NumberField source="wkType$" label="table.field.locItem.wkType" />
                     <NumberField source="matnrId" label="table.field.locItem.matnrId" />
-                    <TextField source="maktx" label="table.field.locItem.maktx" />
                     <TextField source="matnrCode" label="table.field.locItem.matnrCode" />
+                    <TextField source="maktx" label="table.field.locItem.maktx" />
+                    <TextField source="spec" label="table.field.locItem.spec" />
+                    <TextField source="model" label="table.field.locItem.model" />
+                    <TextField source="batch" label="table.field.locItem.batch" />
                     <TextField source="trackCode" label="table.field.locItem.trackCode" />
                     <TextField source="unit" label="table.field.locItem.unit" />
                     <NumberField source="anfme" label="table.field.locItem.anfme" />
-                    <TextField source="batch" label="table.field.locItem.batch" />
                     <TextField source="splrBatch" label="table.field.locItem.splrBatch" />
-                    <TextField source="spec" label="table.field.locItem.spec" />
-                    <TextField source="model" label="table.field.locItem.model" />
                     <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />
-                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
-                        <TextField source="nickname" />
-                    </ReferenceField>
+                    <TextField source="updateBy$" label="common.field.updateBy"  />
                     <DateField source="updateTime" label="common.field.updateTime" showTime />
-                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-                        <TextField source="nickname" />
-                    </ReferenceField>
+                    <TextField source="createBy$" label="common.field.createBy" />
                     <DateField source="createTime" label="common.field.createTime" showTime />
                     <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt">
                         <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
-                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+                        {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
                     </WrapperField>
                 </StyledDatagrid>
             </List>

--
Gitblit v1.9.1