From 8dfd55ef1c0eccf3adf105f0d4f5828bdbc3f86d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 18:52:47 +0800
Subject: [PATCH] lsh#自动组托
---
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index acf72ae..b801437 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -44,24 +44,24 @@
MenuItem
} from '@mui/material';
+
+import { DataGrid, useGridApiRef, GRID_DATE_COL_DEF, GRID_DATETIME_COL_DEF, getGridDateOperators, useGridApiContext } from '@mui/x-data-grid';
+import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
+import { LocalizationProvider, DatePicker, DateTimePicker } from '@mui/x-date-pickers';
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
-import ConfirmButton from "../../components/ConfirmButton";
-import AsnWareModal from "./AsnWareModal";
-import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
-import SaveIcon from '@mui/icons-material/Save';
-import request from '@/utils/request';
-import { Add, Edit, Delete } from '@mui/icons-material';
-import _, { set } from 'lodash';
-import { DataGrid, useGridApiRef, GRID_DATE_COL_DEF, GRID_DATETIME_COL_DEF, getGridDateOperators, useGridApiContext } from '@mui/x-data-grid';
-import { LocalizationProvider, DatePicker, DateTimePicker } from '@mui/x-date-pickers';
-import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
-import DictionarySelect from "../../components/DictionarySelect";
-import DictSelect from "../../components/DictSelect";
-import "./asnOrder.css";
-import { 'zhCN' as locale } from 'date-fns/locale';
-import { format, } from 'date-fns';
import { DemoContainer } from '@mui/x-date-pickers/internals/demo';
+import DictionarySelect from "../../components/DictionarySelect";
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
+import ConfirmButton from "../../components/ConfirmButton";
+import { Add, Edit, Delete } from '@mui/icons-material';
+import DictSelect from "../../components/DictSelect";
+import SaveIcon from '@mui/icons-material/Save';
+import AsnWareModal from "./AsnWareModal";
+import request from '@/utils/request';
+import _, { set } from 'lodash';
+import "./asnOrder.css";
+
const AsnOrderModal = (props) => {
const { open, setOpen, asnId, billReload } = props;
@@ -187,7 +187,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/asnOrderItem/page`, { asnId });
+ const res = await request.post(`/asnOrderItem/page`, { orderId: asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
@@ -200,6 +200,11 @@
const handleDeleteItem = () => {
+ if (selectedRows.length === 0) {
+ notify('璇烽�夋嫨瑕佸垹闄ょ殑琛�', {type: 'warning'});
+ return;
+ }
+
const newTableData = _.filter(tabelData, (item) => !selectedRows.includes(item.id));
setTableData(newTableData);
}
@@ -258,7 +263,7 @@
onChange={(e) => handleChange(e.target.value, 'poCode')}
/>
</Grid>
- <Grid item md={2}>
+ {/* <Grid item md={2}>
<TextField
label={translate("table.field.asnOrder.logisNo")}
value={formData.logisNo}
@@ -273,7 +278,7 @@
value={formData.arrTime}
onChange={(e) => handleChange(e.target.value, 'arrTime')}
/>
- </Grid>
+ </Grid> */}
</Grid>
</Form>
</Box>
@@ -527,17 +532,17 @@
// ),
// headerClassName: "custom",
// },
- {
- field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName') + "*",
- minWidth: 100,
- flex: 1,
- editable: true,
- renderEditCell: (params) => (
- <SelectInputSplrNameEditCell {...params} />
- ),
- headerClassName: "custom",
- },
+ // {
+ // field: 'splrName',
+ // headerName: translate('table.field.asnOrderItem.splrName') + "*",
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // renderEditCell: (params) => (
+ // <SelectInputSplrNameEditCell {...params} />
+ // ),
+ // headerClassName: "custom",
+ // },
{
field: 'platItemId',
headerName: translate('table.field.asnOrderItem.platItemId') + "*",
@@ -701,7 +706,7 @@
},
},
}}
- pageSizeOptions={[15, 25, 50, 100]}
+ pageSizeOptions={[10, 20, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
--
Gitblit v1.9.1