Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-10-14 e6bf567a863fb8a6bc7b776ac938825111c9ab52

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -543,7 +543,7 @@
        qualityInsTime:'质检时间',
        completedArea:'完工面积',
        wornArea:'次破面积',
        pleaseGreaterThanOrEqual1:'请输入大于等于',
        pleaseGreaterThanOrEqual1:'请输入小于等于',
        pleaseGreaterThanOrEqual2:'的数字',
        lossCount1:'损耗数',
        lossCount2:'不能大于',
@@ -560,6 +560,16 @@
        pleaseNumber9:'正确的完工或次破数量',
    },
    productStock:{
        page:{
            productStockList:"库存查询",
            createProductStock:"成品入库",
            storageRecord:"出入库记录",
            orderAllocation:'订单调拨',
            finishedProductOut:'成品出库',
            finishedGoodsIssue:'成品领出',
            transferRecord:'调拨记录',
            takeOutRecord:'领出记录'
        },
        inventoryQuery:'库存查询',
        finishedProductWarehousing:"成品入库 ",
        finishedProductOutbound:'成品出库',
@@ -963,7 +973,11 @@
        teamName:'班组名称',
        processInvolved:'所在工序',
    },
    mainIngredient:{
    ingredients:{
        page:{
            selectIngredients:"物料资料",
            createIngredients:"物料新增"
        },
        materialInformation :'物料资料',
        materialAddition :'物料新增',
        originalFilm :'原片',
@@ -974,7 +988,15 @@
        pleaseEnterData :'请输入数据',
        pleaseEnter :'请输入',
    },
    mainIngredientStock:{
    ingredientsStock:{
        page:{
            selectIngredientsStock:"物料库存",
            materialOutbound:"物料出库",
            returnToStorage:"返库",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            returnToStorageCreate:'返库新增'
        },
        materialName :'物料名称',
        producer :'产地',
        dateOfManufacture :'生产日期',
@@ -1019,13 +1041,21 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
    },
    mainBasicData:{
    warehouseBasicData:{
        page:{
            warehouseSearchBasicData:"库存基础"
        },
        BasicData :'基础数据',
        operateTypeName :'名称',
        operateType :'别称',
        type :'类型',
        takeOut :'领出',
    },
    stockReport:{
        page:{
            warehouseReport:"仓储报表"
        }
    },
    components:{
        addNewSignature :'新增标签名',
        addColumnNames :'新增列名',