no message

skyouc

2025-04-11 c99ccf370df6d868397b06d720dba6842b9bb161

no message

 rsf-admin/src/page/asnOrderLog/AsnOrderLogEdit.jsx

@@ -28,7 +28,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
// import AsnOrderItemLogList from "./AsnOrderItemLogList"
import AsnOrderItemLogList from "./AsnOrderItemLogList"
const FormToolbar = () => {
    const { getValues } = useFormContext();

@@ -141,7 +141,7 @@
                    {translate('common.edit.title.common')}
                </Typography>
            </Grid>
            {/* <AsnOrderItemLogList /> */}
            <AsnOrderItemLogList />
        </>
    )
}

 rsf-admin/src/page/purchase/PurchaseItemList.jsx

@@ -1,5 +1,4 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { useNavigate, useLocation } from 'react-router-dom';
import {
  List,
  DatagridConfigurable,
@@ -8,28 +7,16 @@
  SelectColumnsButton,
  EditButton,
  FilterButton,
  CreateButton,
  ExportButton,
  BulkDeleteButton,
  WrapperField,
  useRecordContext,
  useTranslate,
  useNotify,
  useListContext,
  FunctionField,
  TextField,
  NumberField,
  DateField,
  BooleanField,
  ReferenceField,
  TextInput,
  DateTimeInput,
  DateInput,
  SelectInput,
  NumberInput,
  ReferenceInput,
  ReferenceArrayInput,
  AutocompleteInput,
  DeleteButton,
  useGetRecordId,
} from 'react-admin';
@@ -58,7 +45,6 @@

const filters = [
  <SearchInput source="condition" alwaysOn />,

  <NumberInput source="purchaseId" label="table.field.purchaseItem.purchaseId" />,
  <TextInput source="platItemId" label="table.field.purchaseItem.platItemId" />,
  <TextInput source="matnrCode" label="table.field.purchaseItem.matnrCode" />,
@@ -72,7 +58,6 @@
  <TextInput source="splrName" label="table.field.purchaseItem.splrName" />,
  <TextInput source="splrCode" label="table.field.purchaseItem.splrCode" />,
  <TextInput source="splrBatch" label="table.field.purchaseItem.splrBatch" />,

  <TextInput label="common.field.memo" source="memo" />,
  <SelectInput
    label="common.field.status"

 rsf-admin/src/page/system/dicts/dictType/DictDataEdit.jsx

@@ -24,6 +24,7 @@
    useRedirect,
    useEditContext,
    EditBase,
    useGetOne,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography, Dialog, DialogActions, DialogContent, DialogTitle } from '@mui/material';
@@ -57,6 +58,8 @@
            setOpen(false);
        }
    };
    const {data, isPending, } = useGetOne('dictData', {id: record?.id});
    if (data == null || data == undefined) {return}
    return (
        <>
            <Edit

 rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx

@@ -105,7 +105,7 @@
                        marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                    }}
                    title={"menu.dictData"}
                    empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                    empty={false}
                    filters={filters}
                    filter={{ dictTypeId: dictId }}
                    sort={{ field: "create_time", order: "desc" }}
@@ -121,7 +121,7 @@
                >
                    <StyledDatagrid
                        bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                        rowClick={(id, resource ,record)=> {
                        rowClick={(id, resource, record) => {
                            setSelect(record)
                            setEditDialog(true)
                        }}
@@ -140,19 +140,18 @@
                        <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                        <TextField source="memo" label="common.field.memo" sortable={false} />
                        <WrapperField cellClassName="opt" label="common.field.opt">
                            {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }}  type="button" redirect={"/dictType/" + dictId} onClick={()=> {                               
                               setEditDialog(true)
                            }} /> */}
                            <Button onClick={()=>{setEditDialog(true)}}>编辑</Button>
                            <Button onClick={() => { setEditDialog(true) }}>编辑</Button>
                            <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode='pessimistic' redirect={"/dictType/" + dictId} />
                        </WrapperField>
                    </StyledDatagrid>
                </List>
                <DictDataEdit
                    open={editDialog}
                    record={select}
                    setOpen={setEditDialog}
                />
                if (!select == null) {
                    <DictDataEdit
                        open={editDialog}
                        record={select}
                        setOpen={setEditDialog}
                    />
                }
                <DictDataCreate
                    open={createDialog}
                    record={dicts}

 rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx

@@ -35,7 +35,7 @@
    const { getValues } = useFormContext();

    return (
        <Toolbar sx={{ justifyContent: 'space-between' }}>
        <Toolbar sx={{ justifyContent: 'end' }}>
            <SaveButton />
            <DeleteButton mutationMode="optimistic" />
        </Toolbar>
@@ -50,6 +50,9 @@
            setOpen(false);
        }
    };
    const {data, isPending, } = useGetOne('serialRuleItem', {id: record?.id});
    if (data == null || data == undefined) {return}

    return (
        <Edit
            id={record.id}

 rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java

@@ -157,7 +157,7 @@
                            FieldsItem item = new FieldsItem();
                            item.setUuid(index)
                                    .setFieldsId(field.getId())
                                    .setMatnrId(Long.parseLong(params.get("matnrId").toString()))
                                    .setMatnrId(!Objects.isNull(params.get("matnrId")) ? Long.parseLong(params.get("matnrId").toString()) : null)
                                    .setValue(params.get(field.getFields()).toString());
                            if (!fieldsItemService.save(item)) {
                                throw new CoolException("扩展字段修改失败！！");