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

skyouc

2025-02-24 c3949ec79f06e7bdee9c3a12367bd97ddf46e033

 rsf-admin/src/i18n/en.js

@@ -129,7 +129,13 @@
        loc: 'Loc',
        container: 'Container',
        contract: 'Contract',
        stockItem: 'StockItem',
        qlyInspect: 'QlyInspect',
        dictType: 'DictType',
        dictData: 'DictData',
        companys: 'Companys',



    },
    table: {
        field: {
@@ -332,34 +338,36 @@
                name: "Name",
                projectName: "ProjectName",
            },
            stockItem: {
                stockId: "stockId",
                matnrId: "matnrId",
            qlyInspect: {
                code: "code",
                matnrk: "matnrk",
                anfme: "anfme",
                workQty: "workQty",
                qty: "qty",
                weight: "weight",
                unit: "unit",
                shipperId: "shipperId",
                splrId: "splrId",
                brand: "brand",
                batch: "batch",
                prodTime: "prodTime",
                inspectId: "inspectId",
                splrBtch: "splrBtch",
                asnOrder: "asnOrder",
                erpToken: "erpToken",
                erpOrder: "erpOrder",
                erpStkAdr: "erpStkAdr",
                locId: "locId",
                barcode: "barcode",
                purPrice: "purPrice",
                lockReason: "lockReason",
                lockStatus: "lockStatus",
                locker: "locker",
                lockedTime: "lockedTime",
                name: "name",
            },
            dictType: {
                code: "Code",
                name: "Name",
                description: "Description",
            },
            dictData: {
                dictTypeId: "dictTypeId",
                dictTypeCode: "dictTypeCode",
                value: "value",
                label: "label",
                sort: "sort",
                color: "color",
            },
            companys: {
                code: "Code",
                name: "Name",
                nameEn: "NameEn",
                breifCode: "BreifCode",
                type: "Type",
                contact: "Contact",
                tel: "Tel",
                email: "Email",
                pcode: "PCode",
                province: "Province",
                city: "City",
                address: "Address",
            },
        }
    },
@@ -417,6 +425,20 @@
                },
            },
        },
        matnr: {
            title: {
                basic: 'basic info',
                control: 'control',
                batchRole: 'batch role',
            }
        },
        
    },
    form: {
        matnr: {
            shipper: 'shipper is required',
            groupId: 'groupId is required',
        }
    }
};