From 20b61979b0709ea86752332c04b46add0f8f48f7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 13 八月 2025 12:06:54 +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 | 67 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 43a9442..11ed2a0 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -1,5 +1,3 @@
-import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useLocation, useNavigate } from 'react-router-dom';
import {
List,
DatagridConfigurable,
@@ -8,9 +6,6 @@
SelectColumnsButton,
EditButton,
FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
useDataProvider,
WrapperField,
useRecordContext,
@@ -18,7 +13,6 @@
useNotify,
useRefresh,
useListContext,
- FunctionField,
TextField,
NumberField,
DateField,
@@ -37,29 +31,31 @@
useRedirect,
useUnselectAll,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import AsnOrderModal from "./AsnOrderModal";
-import AsnOrderPanel from "./AsnOrderPanel";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
-import BillStatusField from '../../components/BillStatusField';
-import ConfirmButton from '../../components/ConfirmButton';
-import PageDrawer from "../../components/PageDrawer";
+
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import ConstructionIcon from "@mui/icons-material/Construction";
-import EditIcon from '@mui/icons-material/Edit';
-import TaskIcon from '@mui/icons-material/Task';
-import CloseIcon from '@mui/icons-material/Close';
-import request from '@/utils/request';
+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 ConfirmButton from '../../components/ConfirmButton';
import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import ImportButton from "../../components/ImportButton";
-import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
-import OrderPrintPreview from "./OrderPrintPreview";
-import CreateNewFolderOutlinedIcon from '@mui/icons-material/CreateNewFolderOutlined';
import AsnCreateByPoModal from "./AsnCreateByPoModal";
+import PageDrawer from "../../components/PageDrawer";
+import OrderPrintPreview from "./OrderPrintPreview";
+import CloseIcon from '@mui/icons-material/Close';
+import EditIcon from '@mui/icons-material/Edit';
+import TaskIcon from '@mui/icons-material/Task';
+import { styled } from '@mui/material/styles';
+import AsnOrderModal from "./AsnOrderModal";
+import request from '@/utils/request';
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -69,7 +65,7 @@
},
'& .column-name': {
},
-
+
'& .wkType': {
width: 110
},
@@ -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,7 +158,7 @@
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$','createBy$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
@@ -351,15 +339,16 @@
const BtnBulkExport = () => {
const { filter, selectedIds, filterValues, resource, sort, total } = useListContext();
- const refresh = useRefresh();
- const dataProvider = useDataProvider();
- const notify = useNotify();
const unSelect = useUnselectAll(resource);
+ const dataProvider = useDataProvider();
+ const refresh = useRefresh();
+ const notify = useNotify();
const bulkExport = () => {
getExport()
unSelect();
}
+
const getExport = () => {
dataProvider
.export(resource, {
--
Gitblit v1.9.1