Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-04-09 a64d342c0371eadebc29dae2a60a9525ce95e222

Merge remote-tracking branch 'origin/devlop' into devlop

 rsf-admin/src/config/setting.js

@@ -15,7 +15,7 @@

export const DEFAULT_THEME_NAME = 'rsf';

export const DEFAULT_THEME_MODE = 'dark';
export const DEFAULT_THEME_MODE = 'light';

export const TOKEN_HEADER_NAME = 'Authorization';


 rsf-admin/src/i18n/en.js

@@ -840,6 +840,7 @@
        close: "close",
        asnCreate: "asnCreate",
        createTask: "createTask",
        recover: "recover",
    },
};


 rsf-admin/src/i18n/zh.js

@@ -537,7 +537,7 @@
                packName: "包装名称",
                ntyStatus: "报检状态",
                prodTime: "生产日期",
                platItemId: 'PO行号'
                platItemId: 'PO单号'
            },
            asnOrderLog: {
                code: "编码",
@@ -854,6 +854,7 @@
        close: "关闭",
        asnCreate: "通过ASN创建",
        createTask: "生成任务",
        recover: "继续收货",
    },
};


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

@@ -88,6 +88,8 @@
    const [formData, setFormData] = useState({
        type: '',
        wkType: '',
        poCode: '',
        logisNo: ''
    });

    const [tabelData, setTableData] = useState([]);
@@ -104,6 +106,8 @@
        setFormData({
            type: '',
            wkType: '',
            poCode: '',
            logisNo: ''
        })
        setTableData([])
    }
@@ -222,7 +226,7 @@
                    <Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
                        <Form>
                            <Grid container spacing={2}>
                                <Grid item md={4}>
                                <Grid item md={3}>
                                    <DictSelect
                                        label={translate("table.field.asnOrder.type")}
                                        value={formData.type}
@@ -234,13 +238,29 @@

                                </Grid>

                                <Grid item md={4}>
                                <Grid item md={3}>
                                    <DictSelect
                                        label={translate("table.field.asnOrder.wkType")}
                                        value={formData.wkType}
                                        onChange={(e) => handleChange(e.target.value, 'wkType')}
                                        dictTypeCode="sys_business_type"
                                        required
                                    />
                                </Grid>

                                <Grid item md={3}>
                                    <TextField
                                        label={translate("table.field.asnOrder.poCode")}
                                        value={formData.poCode}
                                        onChange={(e) => handleChange(e.target.value, 'poCode')}
                                    />
                                </Grid>

                                <Grid item md={3}>
                                    <TextField
                                        label={translate("table.field.asnOrder.logisNo")}
                                        value={formData.logisNo}
                                        onChange={(e) => handleChange(e.target.value, 'logisNo')}
                                    />
                                </Grid>
                            </Grid>
@@ -460,8 +480,14 @@
                disableColumnSorting
                disableMultipleColumnsSorting
                processRowUpdate={processRowUpdate}
                pageSizeOptions={[25, 50, 100]}
                paginationModel={{ pageSize: 50, page: 0 }}
                initialState={{
                    pagination: {
                        paginationModel: {
                            pageSize: 25,
                        },
                    },
                }}
                pageSizeOptions={[10, 25, 50, 100]}
                editMode="row"
                checkboxSelection
                onRowSelectionModelChange={handleSelectionChange}

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

@@ -168,8 +168,14 @@
                disableMultipleColumnsSorting
                columnHeaderHeight={40}
                rowHeight={42}
                paginationModel={{ pageSize: 10, page: 1 }}
                pageSizeOptions={[10, 25, 50, 100]}
                initialState={{
                    pagination: {
                        paginationModel: {
                            pageSize: 10,
                        },
                    },
                }}
                pageSizeOptions={[10, 25, 50]}
            />
        </Box >


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

@@ -31,6 +31,8 @@
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
    useRefresh,
    Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -43,6 +45,7 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import ReplayIcon from '@mui/icons-material/Replay';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -54,7 +57,7 @@
    '& .column-name': {
    },
    '& .opt': {
        width: 200
        width: 300
    },
}));

@@ -161,6 +164,7 @@
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                        <RecoverButton />
                    </WrapperField>
                </StyledDatagrid>
            </List>
@@ -179,3 +183,25 @@
}

export default AsnOrderLogList;

const RecoverButton = () => {
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();
    const requestRecover = async () => {
        const { data: { code, data, msg } } = await request.post(`/asnOrder/recover/${record.id}`);

        if (code === 200) {
            notify(msg);
            refresh()
        } else {
            notify(msg);
        }
    }

    return (
        (<Button onClick={requestRecover} label={"toolbar.recover"} color="success">
            <ReplayIcon />
        </Button>)
    )
}

 rsf-admin/src/page/qlyInspect/AsnSelModal.jsx

@@ -38,7 +38,7 @@
    };

    const [formData, setFormData] = useState({
        code: ''
        asnCode: ''
    });

    const [tableData, setTableData] = useState([]);
@@ -54,7 +54,7 @@

    const reset = () => {
        setFormData({
            code: ''
            asnCode: ''
        })
    }

@@ -72,9 +72,7 @@
    };

    const getData = async () => {
        const res = await request.post(`/qlyInspect/asn/list`, {
            ...formData,
        });
        const res = await request.post(`/qlyInspect/asn/list`, { asnCode: formData.asnCode });
        if (res?.data?.code === 200) {
            setTableData(res.data.data);
        } else {
@@ -116,8 +114,8 @@
                        <Grid item md={4}>
                            <TextField
                                label={translate('table.field.asnOrder.code')}
                                name="code"
                                value={formData.code}
                                name="asnCode"
                                value={formData.asnCode}
                                onChange={handleChange}
                                size="small"
                            />

 rsf-admin/src/page/system/role/AssignPermissions.jsx

@@ -177,11 +177,11 @@
            <Card sx={{
                ml: 1,
                mr: 1,
                height: '620px'
                height: 'calc(100vh - 140px)',
                overflowY: 'auto'
            }}>
                <CardContent sx={{
                    overflow: 'auto',
                    height: '100%',
                    display: 'flex',
                    flexDirection: 'column',
                    justifyContent: 'space-between'
@@ -218,7 +218,6 @@
                        </Box>

                        <Box sx={{
                            height: 480,
                            minWidth: 290,
                            overflow: 'auto',
                            marginTop: '10px',

 rsf-admin/src/page/system/role/RoleList.jsx

@@ -61,8 +61,6 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
    <TextInput source="name" label="table.field.role.name" />,
    <TextInput source="code" label="table.field.role.code" />,

@@ -132,8 +130,6 @@
                    preferenceKey='role'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <RolePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'memo']}
                >
                    <NumberField source="id" />

 rsf-admin/src/page/system/user/UserList.jsx

@@ -91,8 +91,6 @@

const filters = [
  // <SearchInput source="condition" alwaysOn />,
  <DateInput label="common.time.after" source="timeStart" alwaysOn />,
  <DateInput label="common.time.before" source="timeEnd" alwaysOn />,

  <TextInput source="username" label="table.field.user.username" />,
  <TextInput source="nickname" label="table.field.user.nickname" />,
@@ -148,8 +146,6 @@
          <BulkDeleteButton mutationMode={OPERATE_MODE} />
        )}
        rowClick={(id, resource, record) => false}
        expand={() => <UserPanel />}
        expandSingle={true}
        omit={[
          "id",
          "email",