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

zjj

2025-05-23 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx

@@ -49,6 +49,7 @@
import AsnSelModal from "./AsnSelModal";
import InspectModal from "./InspectModal";
import QlyInspectOpCreate from './QlyInspectOpCreate';
import ConfirmButton from "../../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
        height: '.9em'
@@ -116,7 +117,7 @@
                actions={(
                    <TopToolbar>
                        <AsnCreatButton />
                        <MyCreateButton onClick={() => { setOpCreateDialog(true) }} />
                        {/* <MyCreateButton onClick={() => { setOpCreateDialog(true) }} /> */}
                        <FilterButton />
                        <SelectColumnsButton preferenceKey='qlyInspect' />
                        <MyExportButton />
@@ -133,14 +134,11 @@
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.qlyInspect.code" />
                    <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
                    <TextField source="wkType$" label="table.field.qlyInspect.wkType" />
                    <NumberField source="asnId" label="table.field.qlyInspect.asnId" />
                    <NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
                    <NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
                    <NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
                    <NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />
                    <NumberField source="isptQty" label="table.field.qlyInspect.isptQty" />
                    <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
                    <TextField source="updateBy$" label="common.field.updateBy" />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <TextField source="createBy$" label="common.field.createBy" />
@@ -151,7 +149,7 @@
                        <EditButton label="toolbar.detail" />
                        <InspectionButton />
                        <CompleteButton />
                        <CloseButton />
                        {/* <CloseButton /> */}
                    </WrapperField>
                </StyledDatagrid>
            </List>
@@ -174,6 +172,12 @@
}

export default QlyInspectList;

const PrintLabelButton = () => {
    const record = useRecordContext();


}

const InspectionButton = () => {
    const record = useRecordContext();
@@ -200,7 +204,7 @@
    const notify = useNotify();
    const refresh = useRefresh();
    const requestComplete = async () => {
        const { data: { code, data, msg } } = await request.post(`/qlyInspect/update`, { ...record, isptStatus: '1' });
        const { data: { code, data, msg } } = await request.post(`/qlyInspect/verify/complate/` + record?.id);
        if (code === 200) {
            notify(msg);
            refresh()
@@ -210,9 +214,7 @@
    }

    return (
        record.isptStatus != 1 && record.isptStatus != 3 ? (<Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}>
            <TaskIcon />
        </Button>) : (<></>)
        record.isptStatus == 2 ? (<ConfirmButton label={"toolbar.verifyComfirm"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} />) : (<></>)
    )
}

@@ -231,7 +233,6 @@
            notify(msg);
        }
    }


    return (
        <Button onClick={requestClose} label={"toolbar.close"}>