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'
@@ -171,7 +173,12 @@
        permissions: 'Permissions',
        delivery: 'Delivery',
        outStock: 'Out Stock',
        outStockItem: 'Out Stock Item'
        outStockItem: 'Out Stock Item',
        inStockPoces: 'In Stock Pocess',
        outStockPoces: 'Out Stock Pocess',
        deviceBind: 'Device Bind',
        wave: 'Wave Manage',

    },
    table: {
        field: {
@@ -613,6 +620,7 @@
            },
            deliveryItem: {
                deliveryId: "deliveryId",
                deliveryCode: "Delivery Code",
                platItemId: "platItemId",
                matnrCode: "matnrCode",
                matnrName: "matnrName",
@@ -664,7 +672,6 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                sites: "sites",
            },
            waitPakin: {
                code: "code",
@@ -714,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",
@@ -830,6 +863,18 @@
                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",
            },
        }
    },
    page: {
@@ -917,6 +962,7 @@
        batch: 'batch',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
        bulkExport: "Bulk Export",
        continue: 'Continue Receipt',
        confirmSelect: 'Confirm Select',
@@ -937,9 +983,10 @@
        quality: "quality",
        complete: "complete",
        close: "close",
        asnCreate: "asnCreate",
        asnCreate: "Create By Order",
        createTask: "createTask",
        recover: "recover",
        createWave: "Create Wave",
        order: 'Orders',

    },