From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +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 | 141 ++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 62 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index 0125c45..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,27 +31,30 @@
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 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': {
@@ -68,14 +65,20 @@
},
'& .column-name': {
},
- '& .opt': {
- width: 220
- },
+
'& .wkType': {
width: 110
},
'& .status': {
width: 90
+ },
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ },
+ '& .opt': {
+ width: 220,
},
}));
@@ -85,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) => {
@@ -114,8 +110,10 @@
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
+ const [poCreate, setPoCreate] = useState(false);
const [printOrder, setPrintOrder] = useState(false);
const [select, setSelect] = useState({});
+ const invoiceRef = useRef();
const billReload = useRef();
const notify = useNotify();
const refresh = useRefresh();
@@ -135,11 +133,13 @@
title={"menu.asnOrder"}
empty={false}
filters={filters}
+ filter={{ deleted: 0, type: 'in' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
+ <CreateByPoButton setPoCreate={setPoCreate} />
<SelectColumnsButton preferenceKey='asnOrder' />
<ImportButton value={'asnOrderItem'} />
<MyExportButton />
@@ -155,12 +155,10 @@
<InspectionsButton />
<MyExportButton />
{/* <BtnBulkExport></BtnBulkExport> */}
- <BulkDeleteButton mutationMode={OPERATE_MODE}
- />
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
@@ -170,10 +168,9 @@
<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" /> */}
<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" />
+ <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -185,8 +182,8 @@
<MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
<InspectionButton />
<CompleteButton />
- <ODeleteButton />
- <PrintButton setPrintOrder={setPrintOrder} setSelect={setSelect}/>
+ <ODeleteButton />
+ <PrintButton setPrintOrder={setPrintOrder} setSelect={setSelect} />
{/* <CloseButton /> */}
</WrapperField>
</StyledDatagrid>
@@ -197,10 +194,14 @@
asnId={modalType}
billReload={billReload}
/>
- <OrderPrintPreview
+ <OrderPrintPreview
open={printOrder}
setOpen={setPrintOrder}
record={select}
+ />
+ <AsnCreateByPoModal
+ open={poCreate}
+ setOpen={setPoCreate}
/>
<PageDrawer
title='AsnOrder Detail'
@@ -213,9 +214,24 @@
}
export default AsnOrderList;
+//鎸塒O鍗曟柊寤�
+const CreateByPoButton = ({ setPoCreate }) => {
+ const record = useRecordContext();
+
+ const createEvent = (event) => {
+ event.stopPropagation();
+ setPoCreate(true)
+ }
+ return (
+ <Button label={"toolbar.poCreate"} onClick={createEvent}>
+ <CreateNewFolderOutlinedIcon />
+ </Button>
+ )
+}
+
//鎵撳嵃鎸夐挳
-const PrintButton = ({setPrintOrder, setSelect}) => {
+const PrintButton = ({ setPrintOrder, setSelect }) => {
const record = useRecordContext();
const printOrder = (event) => {
event.stopPropagation();
@@ -224,9 +240,9 @@
}
return (
- <Button label={"toolbar.print"} onClick={printOrder}>
- <PrintOutlinedIcon />
- </Button>
+ <Button label={"toolbar.print"} onClick={printOrder}>
+ <PrintOutlinedIcon />
+ </Button>
)
}
@@ -234,7 +250,7 @@
const ODeleteButton = () => {
const record = useRecordContext();
return (
- record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic"/> : <></>
+ record.exceStatus === 0 ? <DeleteButton mutationMode="pessimistic" /> : <></>
)
}
@@ -250,15 +266,15 @@
};
return (
record.exceStatus === 1 || record.exceStatus === 0 ?
- <Button
- color="primary"
- startIcon={<EditIcon />}
- onClick={(btn) => handleEditClick(btn)}
- sx={{ ml: 1 }}
- label={'ra.action.edit'}
- >
- </Button>
- : <></>
+ <Button
+ color="primary"
+ startIcon={<EditIcon />}
+ onClick={(btn) => handleEditClick(btn)}
+ sx={{ ml: 1 }}
+ label={'ra.action.edit'}
+ >
+ </Button>
+ : <></>
)
}
@@ -283,7 +299,7 @@
}
return (
- <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
+ <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
)
}
@@ -323,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, {
@@ -387,7 +404,7 @@
// record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
// <TaskIcon />
// </Button> : )
- record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
+ record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
)
@@ -409,6 +426,6 @@
}
return (
- <ConfirmButton label={"toolbar.close"} color="error" startIcon={<CloseIcon />} onConfirm={requestClose} />
+ <ConfirmButton label={"toolbar.close"} color="error" startIcon={<CloseIcon />} onConfirm={requestClose} />
)
}
--
Gitblit v1.9.1