From fa924875ed3f2a8601ce04b7a65e53bc60b81091 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 十二月 2025 13:02:08 +0800
Subject: [PATCH] *
---
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index fbe9491..30787ea 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -1,4 +1,3 @@
-import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import {
List,
DatagridConfigurable,
@@ -7,9 +6,6 @@
SelectColumnsButton,
EditButton,
FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
useDataProvider,
WrapperField,
useRecordContext,
@@ -17,7 +13,6 @@
useNotify,
useRefresh,
useListContext,
- FunctionField,
TextField,
NumberField,
DateField,
@@ -39,14 +34,15 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import CreateNewFolderOutlinedIcon from '@mui/icons-material/CreateNewFolderOutlined';
+import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
import DictionarySelect from "../../components/DictionarySelect";
import ConstructionIcon from "@mui/icons-material/Construction";
import BillStatusField from '../../components/BillStatusField';
+import MyExportButton from '../../components/MyExportButton';
import { Box, Typography, Card, Stack } from '@mui/material';
import MyCreateButton from "../../components/MyCreateButton";
import { useLocation, useNavigate } from 'react-router-dom';
-import MyExportButton from '../../components/MyExportButton';
import ConfirmButton from '../../components/ConfirmButton';
import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import ImportButton from "../../components/ImportButton";
@@ -83,7 +79,6 @@
},
'& .opt': {
width: 220,
-
},
}));
@@ -93,28 +88,21 @@
<TextInput source="poCode" label="table.field.asnOrder.poCode" />,
<NumberInput source="poId" label="table.field.asnOrder.poId" />,
<TextInput source="type" label="table.field.asnOrder.type" />,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.asnOrder.wkType">
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: "1" }} label="table.field.asnOrder.wkType" alwaysOn>
<AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" />
</ReferenceInput>,
<NumberInput source="anfme" label="table.field.asnOrder.anfme" />,
<NumberInput source="qty" label="table.field.asnOrder.qty" />,
<TextInput source="logisNo" label="table.field.asnOrder.logisNo" />,
<DateInput source="arrTime" label="table.field.asnOrder.arrTime" />,
- <SelectInput source="rleStatus" label="table.field.asnOrder.rleStatus"
- choices={[
- { id: 0, name: ' 姝ｅ父' },
- { id: 1, name: ' 宸查噴鏀�' },
- ]}
- />,
-
<TextInput label="common.field.memo" source="memo" />,
<DictionarySelect
label='table.field.asnOrder.exceStatus'
name="exceStatus"
+ group="1"
dictTypeCode="sys_asn_exce_status"
alwaysOn
/>,
-
]
const AsnOrderList = (props) => {
@@ -170,16 +158,24 @@
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'createBy$']}
+ omit={['id', 'code', 'poId', 'arrTime', 'createTime', 'createBy', 'memo', 'logisNo', 'updateBy$', 'updateTime', 'rleStatus$', 'createBy$']}
>
<NumberField source="id" />
- <TextField source="code" label="table.field.asnOrder.code" />
+ {/* <TextField source="code" label="table.field.asnOrder.code" /> */}
<TextField source="poCode" label="table.field.asnOrder.poCode" />
<NumberField source="poId" label="table.field.asnOrder.poId" />
<TextField source="type$" label="table.field.asnOrder.type" />
<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="purchaseOrgName" label="閲囪喘缁勭粐" />
+ <TextField source="purchaseUserName" label="閲囪喘鍛�" />
+ <TextField source="purchaseDate" label="閲囪喘鏃ユ湡" />
+ <TextField source="supplierId" label="渚涘簲鍟嗙紪鐮�" />
+ <TextField source="supplierName" label="渚涘簲鍟�" />
+
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
<TextField source="logisNo" label="table.field.asnOrder.logisNo" />
@@ -418,8 +414,6 @@
// </Button> : )
record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
)
-
-
}
const CloseButton = () => {
--
Gitblit v1.9.1