From e42c5977ec786eb72af7294e3d3d8bcf4ae47413 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 14:24:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 6 ++++++
rsf-admin/src/page/work/components/locItemInfoModal.jsx | 0
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx | 8 +++-----
rsf-admin/src/page/work/components/StaSelect.jsx | 0
rsf-admin/src/page/work/checkOutBound/index.jsx | 0
rsf-admin/src/page/ResourceContent.js | 4 ++--
rsf-admin/src/page/work/outBound/index.jsx | 0
7 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index f324b18..64483a6 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -49,8 +49,8 @@
import basStation from './basicInfo/basStation';
import warehouseStock from './statistics/stockManage';
import basContainer from './basicInfo/basContainer';
-import outBound from "./outWork/outBound";
-import checkOutBound from "./outWork/checkOutBound";
+import outBound from "./work/outBound";
+import checkOutBound from "./work/checkOutBound";
const ResourceContent = (node) => {
switch (node.component) {
diff --git a/rsf-admin/src/page/outWork/checkOutBound/CheckOutBoundList.jsx b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
similarity index 98%
rename from rsf-admin/src/page/outWork/checkOutBound/CheckOutBoundList.jsx
rename to rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
index fd5b94f..56af1d0 100644
--- a/rsf-admin/src/page/outWork/checkOutBound/CheckOutBoundList.jsx
+++ b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
@@ -217,12 +217,10 @@
const [columns, setColumns] = useState([
{
- field: 'outQty',
- headerName: translate('table.field.outBound.outQty') + "*",
+ field: 'locCode',
+ headerName: translate('table.field.locItem.locCode'),
width: 100,
- type: 'number',
- editable: true,
- headerClassName: "custom",
+ editable: false,
},
{
field: 'anfme',
diff --git a/rsf-admin/src/page/outWork/checkOutBound/index.jsx b/rsf-admin/src/page/work/checkOutBound/index.jsx
similarity index 100%
rename from rsf-admin/src/page/outWork/checkOutBound/index.jsx
rename to rsf-admin/src/page/work/checkOutBound/index.jsx
diff --git a/rsf-admin/src/page/outWork/components/StaSelect.jsx b/rsf-admin/src/page/work/components/StaSelect.jsx
similarity index 100%
rename from rsf-admin/src/page/outWork/components/StaSelect.jsx
rename to rsf-admin/src/page/work/components/StaSelect.jsx
diff --git a/rsf-admin/src/page/outWork/components/locItemInfoModal.jsx b/rsf-admin/src/page/work/components/locItemInfoModal.jsx
similarity index 100%
rename from rsf-admin/src/page/outWork/components/locItemInfoModal.jsx
rename to rsf-admin/src/page/work/components/locItemInfoModal.jsx
diff --git a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
similarity index 98%
rename from rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
rename to rsf-admin/src/page/work/outBound/OutBoundList.jsx
index 69641d6..7a2db95 100644
--- a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -239,6 +239,12 @@
editable: false,
},
{
+ field: 'locCode',
+ headerName: translate('table.field.locItem.locCode'),
+ width: 100,
+ editable: false,
+ },
+ {
field: 'matnrCode',
headerName: translate('table.field.locItem.matnrCode'),
width: 130,
diff --git a/rsf-admin/src/page/outWork/outBound/index.jsx b/rsf-admin/src/page/work/outBound/index.jsx
similarity index 100%
rename from rsf-admin/src/page/outWork/outBound/index.jsx
rename to rsf-admin/src/page/work/outBound/index.jsx
--
Gitblit v1.9.1