Merge branch 'front' into devlop

skyouc

2025-03-25 c2e6fd5492f27d9c3a9786905036bb89518c7c4a

Merge branch 'front' into devlop

 rsf-admin/src/i18n/zh.js

@@ -329,8 +329,8 @@
                splrBtch: "供应商批次",
            },
            loc: {
                warehouseId: "仓库",
                areaId: "库区",
                warehouseId: "所属仓库",
                areaId: "所属库区",
                code: "编码",
                type: "库位类型",
                name: "名称",

 rsf-admin/src/page/asnOrder/AsnOrderModal.jsx

@@ -182,21 +182,21 @@
                                        value={formData.type}
                                        onChange={(e) => handleChange(+e.target.value, 'type')}
                                        size="small"
                                        dictTypeCode="sys_bill_type"
                                        dictTypeCode="sys_order_type"
                                    />

                                </Grid>

                                {/* <Grid item xs={4}>
                                <TextField
                                    label={translate('table.field.asnOrder.wkType')}
                                    name="wkType"
                                    value={formData.wkType}
                                    onChange={handleChange}
                                    variant="outlined"
                                    size="small"
                                />
                            </Grid> */}
                                <Grid item xs={4}>
                                    <DictionarySelect
                                        label={translate("table.field.asnOrder.wkType")}
                                        name="wkType"
                                        value={formData.wkType}
                                        onChange={(e) => handleChange(+e.target.value, 'wkType')}
                                        size="small"
                                        dictTypeCode="sys_business_type"
                                    />
                                </Grid>
                            </Grid>
                        </Form>
                    </Box>

 rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx

@@ -177,6 +177,7 @@
                                    resource={'matnrGroup'}
                                    source="groupId"
                                    value={formData.groupId}
                                    validate={required()}
                                    onChange={(e) => handleChange(e.target.value, 'groupId')}
                                />
                            </Grid>

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx

@@ -25,10 +25,10 @@
    const columns = [
        { field: 'id', headerName: 'ID', width: 100 },
        { field: 'areaId$', headerName: translate('table.field.locAreaMatRela.areaId'), width: 100 },
        { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
        { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
        { field: 'matnrId$', headerName: translate('table.field.locAreaMatRela.matnrId'), width: 100 },
        { field: 'groupId$', headerName: translate('table.field.locAreaMatRela.groupId'), width: 100 },
        { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
        { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
        {
            field: 'action',
            headerName: '操作',
@@ -60,6 +60,8 @@

    const [parmas, setParmas] = useState({
        areaMatId: record.id,
        locTypeId: '',
        groupId: '',
    });

    const [tableData, setTableData] = useState([]);
@@ -111,12 +113,12 @@
        <Grid container spacing={2}>
            {/* 物料分组 */}
            <Grid item xs={2}>
                <MatnrTree matnrTree={matnrTree} setParmas={setParmas} reload={reload} />
                <MatnrTree matnrTree={matnrTree} parmas={parmas} setParmas={setParmas} reload={reload} />
            </Grid>

            {/* 库位类型 */}
            <Grid item xs={2}>
                <LocTree locTree={locTree} setParmas={setParmas} reload={reload} />
                <LocTree locTree={locTree} parmas={parmas} setParmas={setParmas} reload={reload} />
            </Grid>

            {/* 其他内容 */}
@@ -139,7 +141,7 @@
export default LocAreaMatPanel;


const MatnrTree = ({ matnrTree, setParmas, reload }) => {
const MatnrTree = ({ matnrTree, parmas, setParmas, reload }) => {

    const record = useRecordContext();
    const notify = useNotify();
@@ -214,7 +216,7 @@
            groupId: selectedItems
        }

        const res = await request.post(`/locAreaMatRela/group/remove/`, parmas);
        const res = await request.post(`/locAreaMatRela/group/remove`, parmas);
        if (res?.data?.code === 200) {
            reload()
            notify(res.data.msg);
@@ -231,7 +233,10 @@
    };

    const handleNodeSelect = (event, nodeId) => {
        event.stopPropagation()
        event.stopPropagation();
        parmas.groupId = nodeId;
        setParmas(parmas)
        reload()
    };

    return (
@@ -251,10 +256,10 @@
                multiSelect
                items={matnrTree}
                apiRef={apiRef}
                selectedItems={selectedItems}
                getItemId={(item) => item.id}
                getItemLabel={(item) => item.name}
                defaultExpandedItems={['grid']}
                selectedItems={selectedItems}
                onSelectedItemsChange={handleSelectedItemsChange}
                onItemSelectionToggle={handleItemSelectionToggle}
                onItemClick={handleNodeSelect}
@@ -276,7 +281,7 @@
    )
}

const LocTree = ({ locTree, setParmas, reload }) => {
const LocTree = ({ locTree, setParmas, parmas, reload }) => {

    const record = useRecordContext();
    const notify = useNotify();
@@ -364,8 +369,10 @@
    };

    const handleNodeSelect = (event, nodeId) => {
        // event.preventDefault();
        console.log(nodeId)
        event.stopPropagation();
        parmas.locTypeId = nodeId;
        setParmas(parmas)
        reload()
    };

    return (

 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx

@@ -93,14 +93,14 @@
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.matnrGroup.code"
                                        source="code"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.matnrGroup.parentId"

 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx

@@ -64,13 +64,13 @@
                    validate={required()}
                />
            </Grid>
            <Grid item xs={6} display="flex" gap={1}>
            {/* <Grid item xs={6} display="flex" gap={1}>
                <TextInput
                    label="table.field.matnrGroup.code"
                    source="code"
                    parse={v => v}
                />
            </Grid>
            </Grid> */}
        </Grid>
    )
}

 rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx

@@ -269,7 +269,7 @@
                        {expandAll ? translate('common.action.collapseAll') : translate('common.action.expandAll')}
                    </Button>
                    <TextField
                        label="Search"
                        label="搜索"
                        value={filter}
                        onChange={({ target }) => {
                            setFilter(target.value)

 rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx

@@ -157,7 +157,6 @@
                                        multiline
                                        minRows={2}
                                        autoFocus
                                        {...props}
                                    />
                                    {/* <Stack direction="column" spacing={1} width={'100%'}>
                                        <MemoInput />

 rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx

@@ -134,7 +134,15 @@
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                        <TextInput
                            label="common.field.memo"
                            source="memo"
                            parse={v => v}
                            fullWidth
                            multiline
                            minRows={2}
                            autoFocus
                        />
                    </Grid>
                </Grid>
            </SimpleForm>

 rsf-admin/src/page/system/menu/MenuEdit.jsx

@@ -57,6 +57,7 @@
                <TextInput
                    label="table.field.menu.route"
                    source="route"
                    validate={required()}
                    parse={v => v}
                />
            </Grid>
@@ -71,6 +72,7 @@
                <SelectInput
                    label="table.field.menu.type"
                    source="type"
                    validate={required()}
                    choices={[
                        { id: 0, name: 'table.field.menu.enums.menu' },
                        { id: 1, name: 'table.field.menu.enums.button' },
@@ -101,10 +103,16 @@
            <Grid item xs={6} display="flex" gap={1}>
                <StatusSelectInput />
            </Grid>
            <Grid item xs={12} display="flex" gap={1}>
                <Stack direction="column" spacing={1} width={'100%'}>
                    <MemoInput />
                </Stack>
            <Grid item xs={6} display="flex" gap={1}>
                <TextInput
                    label="common.field.memo"
                    source="memo"
                    parse={v => v}
                    fullWidth
                    multiline
                    minRows={2}
                    autoFocus
                />
            </Grid>
        </Grid>
    )