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

zjj

18 小时以前 b69b63a09089566b0b2505fbc39a673c3e18785f

 rsf-admin/src/i18n/en.js

@@ -51,6 +51,7 @@
            before: 'Time Before'
        },
        action: {
            search: 'Search',
            reset: 'Reset',
            expand: 'Expand',
            expandAll: 'Expand All',
@@ -69,6 +70,7 @@
            loadMore: 'Load More Data',
            complete: 'Complete',
            deprecate: 'Deprecate',
            inputPlaceholder: 'Use commas to separate',
            resend: 'RESEND',
            selected: 'selected',
            batch: 'batch'
@@ -132,7 +134,7 @@
        loc: 'Loc',
        locType: 'LocType',
        locArea: 'locArea',
        LocAreaMat: 'LocAreaMat',
        locAreaMat: 'Logic Areas',
        locAreaMatRela: 'LocAreaMatRela',
        container: 'Container',
        contract: 'Contract',
@@ -152,7 +154,7 @@
        whMat: 'Warehouse Mat',
        fields: 'Extend Fields',
        fieldsItem: 'Extend Fields Items',
        warehouseAreasItem: 'WarehouseAreasItem',
        warehouseAreasItem: 'Temp Warehouse Areas Stock',
        deviceSite: 'deviceSite',
        waitPakin: 'WaitPakin',
        waitPakinItem: 'WaitPakinItem',
@@ -160,6 +162,23 @@
        taskItem: 'TaskItem',
        taskItemLog: 'TaskItemLog',
        taskLog: 'TaskLog',
        orderItem: 'OrderItem',
        order: 'Order',
        locItem: 'LocItem',
        stock: 'Stock Manage',
        histories: 'Histories',
        wareWork: 'Warehouse Working',
        statistics: 'Statistics',
        logs: 'Logs',
        permissions: 'Permissions',
        delivery: 'Delivery',
        outStock: 'Out Stock',
        outStockItem: 'Out Stock Item',
        inStockPoces: 'In Stock Pocess',
        outStockPoces: 'Out Stock Pocess',
        deviceBind: 'Device Bind',
        wave: 'Wave Manage',

    },
    table: {
        field: {
@@ -586,6 +605,35 @@
                startTime: "startTime",
                endTime: "endTime",
            },
            delivery: {
                code: "code",
                platId: "platId",
                type: "type",
                wkType: "wkType",
                source: "source",
                anfme: "anfme",
                qty: "qty",
                workQty: "workQty",
                platCode: "platCode",
                startTime: "startTime",
                endTime: "endTime",
            },
            deliveryItem: {
                deliveryId: "deliveryId",
                deliveryCode: "Delivery Code",
                platItemId: "platItemId",
                matnrCode: "matnrCode",
                matnrName: "matnrName",
                fieldsIndex: "fieldsIndex",
                unit: "unit",
                anfme: "anfme",
                qty: "qty",
                nromQty: "nromQty",
                printQty: "printQty",
                splrName: "splrName",
                splrCode: "splrCode",
                splrBatch: "splrBatch",
            },
            purchaseItem: {
                purchaseId: "purchaseId",
                platItemId: "erpItemId",
@@ -624,7 +672,6 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                sites: "sites",
            },
            waitPakin: {
                code: "code",
@@ -674,6 +721,32 @@
                fieldsIndex: "fieldsIndex",
                qty: "qty",
                batch: "batch",
            },
            wave: {
                code: "code",
                type: "type",
                exceStatus: "exceStatus",
                anfme: "anfme",
                qty: "qty",
                orderNum: "orderNum",
            },
            waveItem: {
                waveId: "waveId",
                waveCode: "waveCode",
                matnrId: "matnrId",
                matnrName: "matnrName",
                matnrCode: "matnrCode",
                batch: "batch",
                splrBatch: "splrBatch",
                orderCode: "orderCode",
                orderItemId: "orderItemId",
                unit: "unit",
                trackCode: "trackCode",
                fieldsIndex: "fieldsIndex",
                anfme: "anfme",
                workQty: "workQty",
                qty: "Qty",
                stockLocs: "Stock Locs"
            },
            task: {
                taskCode: "TaskCode",
@@ -741,6 +814,66 @@
                batch: "batch",
                spec: "spec",
                model: "model",
            },
            order: {
                code: "code",
                sourceCode: "sourceCode",
                sourceId: "sourceId",
                type: "type",
                wkType: "wkType",
                anfme: "anfme",
            },
            orderItem: {
                orderId: "orderId",
                orderCode: "orderCode",
                sourceItemId: "sourceItemId",
                matnrId: "matnrId",
                matnrCode: "matnrCode",
                maktx: "maktx",
                anfme: "anfme",
                stockUnit: "stockUnit",
                workQty: "workQty",
                purQty: "purQty",
                purUnit: "purUnit",
                qty: "qty",
                splrCode: "splrCode",
                batch: "batch",
                splrBatch: "splrBatch",
                splrName: "splrName",
                trackCode: "trackCode",
                barcode: "barcode",
                prodTime: "prodTime",
                packName: "packName",
            },
            locItem: {
                locId: "locId",
                orderId: "orderId",
                type: "type",
                orderItemId: "orderItemId",
                wkType: "wkType",
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",
                trackCode: "trackCode",
                unit: "unit",
                anfme: "anfme",
                batch: "batch",
                splrBatch: "splrBatch",
                spec: "spec",
                model: "model",
                fieldsIndex: "fieldsIndex",
            },
            deviceBind: {
                currentRow: "currentRow",
                startRow: "startRow",
                endRow: "endRow",
                deviceQty: "deviceQty",
                startDeviceNo: "startDeviceNo",
                endDeviceNo: "endDeviceNo",
                staList: "staList",
                typeId: "typeId",
                beSimilar: "beSimilar",
                emptySimilar: "emptySimilar",
            },
        }
    },
@@ -829,6 +962,11 @@
        batch: 'batch',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
        bulkExport: "Bulk Export",
        continue: 'Continue Receipt',
        confirmSelect: 'Confirm Select',
        selectSite: 'Select Site',
        top: "top",
        resort: "sort",
        subzone: 'subzone',
@@ -845,9 +983,12 @@
        quality: "quality",
        complete: "complete",
        close: "close",
        asnCreate: "asnCreate",
        asnCreate: "Create By Order",
        createTask: "createTask",
        recover: "recover",
        createWave: "Create Wave",
        order: 'Orders',

    },
};