From d692259553b83ed00ada0ba2792ae91704a4def2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 13:52:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderList.jsx | 4 +---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 10 +++++-----
rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx | 2 +-
rsf-admin/pnpm-lock.yaml | 6 +++---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 29 ++++++++++++++++++++++-------
5 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/pnpm-lock.yaml b/rsf-admin/pnpm-lock.yaml
index 470bcd3..2dfcf80 100644
--- a/rsf-admin/pnpm-lock.yaml
+++ b/rsf-admin/pnpm-lock.yaml
@@ -2994,7 +2994,7 @@
'@mui/private-theming@5.16.14(@types/react@18.3.18)(react@18.3.1)':
dependencies:
- '@babel/runtime': 7.26.9
+ '@babel/runtime': 7.27.0
'@mui/utils': 5.16.14(@types/react@18.3.18)(react@18.3.1)
prop-types: 15.8.1
react: 18.3.1
@@ -3012,7 +3012,7 @@
'@mui/styled-engine@5.16.14(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1))(@types/react@18.3.18)(react@18.3.1))(react@18.3.1)':
dependencies:
- '@babel/runtime': 7.26.9
+ '@babel/runtime': 7.27.0
'@emotion/cache': 11.14.0
csstype: 3.1.3
prop-types: 15.8.1
@@ -3846,7 +3846,7 @@
dom-helpers@5.2.1:
dependencies:
- '@babel/runtime': 7.26.9
+ '@babel/runtime': 7.27.0
csstype: 3.1.3
dompurify@3.2.4:
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index 561522a..ec50864 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -329,8 +329,6 @@
}
return (
- (<Button onClick={requestClose} label={"toolbar.close"} color="error">
- <CloseIcon />
- </Button>)
+ <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
)
}
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 1791f4d..89de5f9 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -89,7 +89,8 @@
type: '',
wkType: '',
poCode: '',
- logisNo: ''
+ logisNo: '',
+ arrTime: ''
});
const [tabelData, setTableData] = useState([]);
@@ -107,7 +108,8 @@
type: '',
wkType: '',
poCode: '',
- logisNo: ''
+ logisNo: '',
+ arrTime: ''
})
setTableData([])
}
@@ -119,10 +121,7 @@
find.anfme = rows[key].anfme.value;
}
setTableData([...tabelData]);
-
}
-
-
const handleSubmit = async () => {
setFinally()
@@ -263,6 +262,21 @@
onChange={(e) => handleChange(e.target.value, 'logisNo')}
/>
</Grid>
+
+ <Grid item md={3}>
+ {/* <TextField
+ label={translate("table.field.asnOrder.arrTime")}
+ value={formData.arrTime}
+ onChange={(e) => handleChange(e.target.value, 'arrTime')}
+ /> */}
+ <DateInput
+ source="arrTime"
+ label="table.field.asnOrder.arrTime"
+ value={formData.arrTime}
+ onChange={(e) => handleChange(e.target.value, 'arrTime')}
+ />
+
+ </Grid>
</Grid>
</Form>
</Box>
@@ -357,10 +371,11 @@
// flex: 1,
// },
{
- field: 'platItemId',
- headerName: translate('table.field.asnOrderItem.platItemId'),
+ field: 'poCode',
+ headerName: translate('table.field.asnOrderItem.poDetlCode'),
minWidth: 100,
flex: 1,
+ editable: true,
},
{
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 3a6c137..bf4c274 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -55,12 +55,12 @@
headerName: translate('table.field.asnOrderItem.asnCode'),
width: 150,
},
+ // {
+ // field: 'poDetlId',
+ // headerName: translate('table.field.asnOrderItem.poDetlId')
+ // },
{
- field: 'poDetlId',
- headerName: translate('table.field.asnOrderItem.poDetlId')
- },
- {
- field: 'poDetlCode',
+ field: 'poCode',
headerName: translate('table.field.asnOrderItem.poDetlCode')
},
{
diff --git a/rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx b/rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx
index a1c2e7c..f3701ff 100644
--- a/rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx
+++ b/rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx
@@ -28,7 +28,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
-import AsnOrderItemLogList from "./AsnOrderItemLogList"
+// import AsnOrderItemLogList from "./AsnOrderItemLogList"
const FormToolbar = () => {
const { getValues } = useFormContext();
--
Gitblit v1.9.1