Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

7 天以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/.env

@@ -1,3 +1,3 @@
VITE_BASE_IP=127.0.0.1
VITE_BASE_IP=192.168.4.50
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080

 rsf-admin/src/config/setting.js

@@ -25,7 +25,7 @@

export const ABORT_SIGNAL = false;

export const DEFAULT_PAGE_SIZE = 15;
export const DEFAULT_PAGE_SIZE = 25;

export const DEFAULT_ITEM_PAGE_SIZE = 10;


 rsf-admin/src/i18n/en.js

@@ -891,6 +891,7 @@
            taskItem: {
                taskId: "taskId",
                orderId: "orderId",
                wkType: 'Work Type',
                orderType: "orderType",
                orderItemId: "orderItemId",
                sourceCode: "sourceCode",

 rsf-admin/src/i18n/zh.js

@@ -920,6 +920,7 @@
                taskId: "taskId",
                orderId: "订单ID",
                orderType: "单据类型",
                wkType: '业务类型',
                orderItemId: "订单明细ID",
                source: "源ID",
                matnrId: "物料ID",

 rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx

@@ -423,7 +423,6 @@
    const notify = useNotify();
    const refresh = useRefresh();


    const [createDialog, setCreateDialog] = useState(false);

    return (

 rsf-admin/src/page/task/TaskItemList.jsx

@@ -146,6 +146,7 @@
                <NumberField source="taskId" label="table.field.taskItem.taskId" />,
                <NumberField source="orderId" label="table.field.taskItem.orderId" />,
                <NumberField source="orderType$" label="table.field.taskItem.orderType" />,
                <NumberField source="wkType$" label="table.field.taskItem.wkType" />,
                <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />,
                <NumberField source="matnrId" label="table.field.taskItem.matnrId" />,
                <TextField source="maktx" label="table.field.taskItem.maktx" />,