parent: ca0d167f | 补丁 | 提交 | ignore whitespace
cl
2026-04-17 3aa2f1033b08a95b6c321a338418146434f284e5 
页面优化
9个文件已修改
54 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/LocItemList.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/locItem/LocItemList.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/locPreview/LocPreviewItems.jsx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/stockItem/StockItemCreate.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/stockItem/StockItemEdit.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/stockItem/StockItemList.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/stockItem/StockItemPanel.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -1458,6 +1458,10 @@


            true: '正常',


            false: '禁用',


        },


        auth: {


            user_menu: '个人资料',


            logout: '退出登录',


        },


        notification: {


            deleted: '删除成功 |||| %{smart_count} 项 删除成功',


        },


@@ -1516,6 +1520,18 @@


            previous: '上一页',


            page_rows_per_page: '每页数量:',


            skip_nav: '跳转到内容',


        },


        saved_queries: {


            label: '已保存查询',


            save_current_query: '保存当前查询',


            query_name: '查询名称',


            new_label: '保存当前查询...',


            new_dialog_title: '将当前查询保存为',


            remove_label: '移除已保存查询',


            remove_label_with_name: '移除查询 "%{name}"',


            remove_dialog_title: '移除已保存查询?',


            remove_message: '您确定要移除已保存查询吗？',


            help: '设置筛选后可保存当前查询，便于下次快速使用',


        }


    },


    request: {




 rsf-admin/src/page/basicInfo/loc/LocItemList.jsx


@@ -58,7 +58,7 @@


    <NumberInput source="matnrId" label="table.field.locItem.matnrId" />,


    <TextInput source="maktx" label="table.field.locItem.maktx" />,


    <TextInput source="matnrCode" label="table.field.locItem.matnrCode" />,


    <TextInput source="trackCode" label="table.field.locItem.trackCode" />,


    // 现品票号已隐藏 <TextInput source="trackCode" label="table.field.locItem.trackCode" />,


    <TextInput source="unit" label="table.field.locItem.unit" />,


    <NumberInput source="anfme" label="table.field.locItem.anfme" />,


    <TextInput source="batch" label="table.field.locItem.batch" />,


@@ -153,7 +153,7 @@


                <TextField source="matnrCode" label="table.field.locItem.matnrCode" />,


                <TextField source="maktx" label="table.field.locItem.maktx" />,


                <TextField source="batch" label="table.field.locItem.batch" />,


                <TextField source="trackCode" label="table.field.locItem.trackCode" />,


                // 现品票号已隐藏 <TextField source="trackCode" label="table.field.locItem.trackCode" />,


                <NumberField source="anfme" label="table.field.locItem.anfme" />,


                <TextField source="unit" label="table.field.locItem.unit" />,


                <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,


@@ -162,7 +162,10 @@


                <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,


                <BooleanField source="statusBool" label="common.field.status" sortable={false} />,


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            // 过滤现品票号扩展字段


            const fields = data


                .filter(el => el.fields !== 'crushNo' && el.fieldsAlise !== '现品票号')


                .map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const lastArr = [


                <TextField source="updateBy$" label="common.field.updateBy" />,


                <DateField source="updateTime" label="common.field.updateTime" showTime />,




 rsf-admin/src/page/locItem/LocItemList.jsx


@@ -169,7 +169,10 @@


                <TextField source="spec" label="table.field.locItem.spec" />,


                <TextField source="model" label="table.field.locItem.model" />


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            // 现品票号已隐藏：过滤扩展字段中的现品票号


            // const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const filteredFields = (data || []).filter(el => el.fields !== 'crushNo' && el.fieldsAlise !== '现品票号');


            const fields = filteredFields.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const lastArr = [


                <DateField source="updateTime" label="common.field.updateTime" showTime />,


                <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>


@@ -183,7 +186,9 @@


            ]


            setColumns([...arr, ...fields, ...lastArr]);




            data.map(el => {


            // 现品票号已隐藏：过滤筛选项中的现品票号


            // data.map(el => {


            filteredFields.map(el => {


                var i = 0;


                filters.map((item) => {


                    if (item.key === el.fields) {




 rsf-admin/src/page/locPreview/LocPreviewItems.jsx


@@ -72,7 +72,7 @@


    <NumberInput source="matnrId" label="table.field.locItem.matnrId" />,


    <TextInput source="maktx" label="table.field.locItem.maktx" />,


    <TextInput source="matnrCode" label="table.field.locItem.matnrCode" />,


    <TextInput source="trackCode" label="table.field.locItem.trackCode" />,


    // 现品票号已隐藏 <TextInput source="trackCode" label="table.field.locItem.trackCode" />,


    <TextInput source="unit" label="table.field.locItem.unit" />,


    <NumberInput source="anfme" label="table.field.locItem.anfme" />,


    <NumberInput source="qty" label="table.field.locItem.qty" />,


@@ -170,7 +170,7 @@


                <TextField source="spec" label="table.field.locItem.spec" />,


                <TextField source="model" label="table.field.locItem.model" />,


                <TextField source="batch" label="table.field.locItem.batch" />,


                <TextField source="trackCode" label="table.field.locItem.trackCode" />,


                // 现品票号已隐藏 <TextField source="trackCode" label="table.field.locItem.trackCode" />,


                <TextField source="unit" label="table.field.locItem.unit" />,


                <NumberField source="anfme" label="table.field.locItem.anfme" options={{ minimumFractionDigits: 2, maximumFractionDigits: 2 }} />,


                <NumberField source="workQty" label="table.field.locItem.workQty" options={{ minimumFractionDigits: 2, maximumFractionDigits: 2 }} />,


@@ -178,7 +178,10 @@


                <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,


                <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            // 现品票号已隐藏：过滤扩展字段中的现品票号


            // const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const filteredFields = (data || []).filter(el => el.fields !== 'crushNo' && el.fieldsAlise !== '现品票号');


            const fields = filteredFields.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const lastArr = [


                <TextField source="updateBy$" label="common.field.updateBy" />,


                <DateField source="updateTime" label="common.field.updateTime" showTime />,




 rsf-admin/src/page/stockItem/StockItemCreate.jsx


@@ -194,6 +194,7 @@


                                        parse={v => v}


                                    />


                                </Grid>


                                {/* 现品票号已隐藏


                                <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.stockItem.trackCode"


@@ -201,6 +202,7 @@


                                        parse={v => v}


                                    />


                                </Grid>


                                */}


                                <Grid item xs={6} display="flex" gap={1}>


                                    <TextInput


                                        label="table.field.stockItem.barcode"




 rsf-admin/src/page/stockItem/StockItemEdit.jsx


@@ -173,6 +173,7 @@


                                parse={v => v}


                            />


                        </Stack>


                        {/* 现品票号已隐藏


                        <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.stockItem.trackCode"


@@ -180,6 +181,7 @@


                                parse={v => v}


                            />


                        </Stack>


                        */}


                        <Stack direction='row' gap={2}>


                            <TextInput


                                label="table.field.stockItem.barcode"




 rsf-admin/src/page/stockItem/StockItemList.jsx


@@ -79,7 +79,7 @@


    <TextInput source="batch" label="table.field.stockItem.batch" />,


    <TextInput source="splrBatch" label="table.field.stockItem.splrBatch" />,


    <TextInput source="splrName" label="table.field.stockItem.splrName" />,


    <TextInput source="trackCode" label="table.field.stockItem.trackCode" />,


    // 现品票号已隐藏 <TextInput source="trackCode" label="table.field.stockItem.trackCode" />,


    <TextInput source="barcode" label="table.field.stockItem.barcode" />,


    <TextInput source="prodTime" label="table.field.stockItem.prodTime" />,


    <TextInput source="packName" label="table.field.stockItem.packName" />,


@@ -152,7 +152,7 @@


                    <TextField source="batch" label="table.field.stockItem.batch" />


                    <TextField source="splrBatch" label="table.field.stockItem.splrBatch" />


                    <TextField source="splrName" label="table.field.stockItem.splrName" />


                    <TextField source="trackCode" label="table.field.stockItem.trackCode" />


                    {/* 现品票号已隐藏 <TextField source="trackCode" label="table.field.stockItem.trackCode" /> */}


                    <TextField source="barcode" label="table.field.stockItem.barcode" />


                    <TextField source="prodTime" label="table.field.stockItem.prodTime" />


                    <TextField source="packName" label="table.field.stockItem.packName" />




 rsf-admin/src/page/stockItem/StockItemPanel.jsx


@@ -136,12 +136,14 @@


                                property={record.splrName}


                            />


                        </Grid>


                        {/* 现品票号已隐藏


                        <Grid item xs={6}>


                            <PanelTypography


                                title="table.field.stockItem.trackCode" 


                                property={record.trackCode}


                            />


                        </Grid>


                        */}


                        <Grid item xs={6}>


                            <PanelTypography


                                title="table.field.stockItem.barcode" 




 rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java


@@ -53,6 +53,7 @@


                        "sys_menu",


                        "sys_http_audit_log",


                        "sys_http_audit_rule",


                        "sys_http_audit_config",


                        "man_loc_type_rela",


                        "man_qly_inspect_result",


                        "view_stock_manage",