skyouc
2 天以前 e42c5977ec786eb72af7294e3d3d8bcf4ae47413
Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
6 文件已重命名
1个文件已修改
18 ■■■■■ 已修改文件
rsf-admin/src/page/ResourceContent.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/checkOutBound/index.jsx 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/components/StaSelect.jsx 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/components/locItemInfoModal.jsx 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/outBound/OutBoundList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/outBound/index.jsx 补丁 | 查看 | 原始文档 | blame | 历史
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) {
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
File was renamed from rsf-admin/src/page/outWork/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',
rsf-admin/src/page/work/checkOutBound/index.jsx
rsf-admin/src/page/work/components/StaSelect.jsx
rsf-admin/src/page/work/components/locItemInfoModal.jsx
rsf-admin/src/page/work/outBound/OutBoundList.jsx
File was renamed from rsf-admin/src/page/outWork/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,
rsf-admin/src/page/work/outBound/index.jsx