From b11e65af82ff4a8608e98811d590690e30781696 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 14:01:55 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
index 8177610..a036f5e 100644
--- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
+++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
@@ -95,7 +95,7 @@
const selectLocItem = async() =>{
const {
data: { code, data, msg },
- } = await request.post("/locItem/page",{
+ } = await request.post("/locItem/useO/page",{
locCode: orgLoc,
current: 1,
pageSize: 100,
@@ -125,7 +125,6 @@
}
})
- console.log(newData);
setTarLocList(newData);
}
@@ -182,7 +181,8 @@
<Stack direction='row' spacing={2} minWidth={200}>
<SubmitButton
orgLoc={orgLoc}
- tarLoc={tarLoc}
+ tarLoc={tarLoc}
+ tabelData={tabelData}
/>
</Stack>
</Box>
@@ -213,17 +213,20 @@
const notify = useNotify();
const redirect = useRedirect();
const refresh = useRefresh();
- const { orgLoc, tarLoc } = props;
+ const { orgLoc, tarLoc, tabelData } = props;
const move = () => {
- console.log(orgLoc, tarLoc);
if (orgLoc === "" || orgLoc === undefined || orgLoc === null) {
- notify("璇烽�夋嫨绔欑偣");
+ notify("璇疯緭鍏ユ簮搴撲綅");
return;
}
- if (tarLoc === "" || tarLoc === undefined || tarLoc === null) {
- notify("璇烽�夋嫨绔欑偣");
+ // if (tarLoc === "" || tarLoc === undefined || tarLoc === null) {
+ // notify("璇疯緭鍏ョ洰鏍囧簱浣�");
+ // return;
+ // }
+ if (tabelData.length === 0) {
+ notify("婧愬簱浣嶆槑缁嗘棤锛岃妫�鏌ュ簱浣嶇姸鎬�");
return;
- }
+ }
http(orgLoc, tarLoc?.id)
}
const http = async (orgLoc, tarLoc) => {
@@ -266,13 +269,13 @@
width: 100,
editable: false,
},
- {
- field: 'workQty',
- headerName: translate('table.field.locItem.workQty'),
- width: 100,
- type: 'number',
- editable: false,
- },
+ // {
+ // field: 'workQty',
+ // headerName: translate('table.field.locItem.workQty'),
+ // width: 100,
+ // type: 'number',
+ // editable: false,
+ // },
{
field: 'locCode',
headerName: translate('table.field.locItem.locCode'),
--
Gitblit v1.9.1