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

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

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

@@ -69,6 +69,14 @@
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        otherColumns:'其他列',
        msg:{
            max255:"最多输入255个字符",
            max10:"最多输入10个字符",
@@ -96,6 +104,10 @@
            range9999Dec: "请输入四位整数",
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -166,6 +178,8 @@

           productAbbreviation:'产品简称',
           productDuplication:'产品重复',
           msg1:'创建人是：',
           msg2:'无法操作！',
       }
    },
    order:{
@@ -242,10 +256,10 @@
        orderHasBeenReceived:'订单已入库',
        printingNumber:'打印次数',
        processingOrder:'加工单',
        sheet2:'横版-多层明细',
        sheet4:'生产加工单纵版',
        sheet2:'横版-多层明细(推荐)',
        sheet4:'纵版-成品信息',
        sheet3:'浏览发货信息',
        sheet5:'生产加工单弯钢(单片)',
        sheet5:'纵版-单片弯钢',
        oneClickStorage:'一键完工',
        oneClickReturn:'一键退回',

@@ -261,11 +275,17 @@
        vertical:'竖',
        exportDXF:'导出dxf',
        selectFile:'选择文件',
        left:'左',
        right:'右',
        edgeAngleCurvature:'边角弧度',
        cuttingCorners:'切边角',
        fourCornerExcavation:'四角挖缺',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
@@ -308,7 +328,24 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！',
            pleaseProcessType:'请选择磨边类型',
            pleaseUploadPicture1:"请先选择要上传的DWG文件或图片文件",
            pleaseUploadPicture2:"准备上传...",
            pleaseUploadPicture3:"上传中...",
            pleaseUploadPicture4:"上传完成!",
            pleaseUploadPicture5:"上传失败!",
            pleaseUploadPicture6:"请选择DWG文件或JPG、PNG格式的图片文件",
            pleaseUploadPicture7:"文件大小不能超过50MB",
            pleaseUploadPicture8:"已选择文件:",
            pleaseUploadPicture9:"文件上传",
            pleaseUploadPicture10:"拖拽文件到此处或",
            pleaseUploadPicture11:"点击选择文件",
            pleaseUploadPicture12:"仅支持 .dwg、.jpg、.png 格式文件，且文件大小不超过50MB",
            pleaseUploadPicture13:"上传进度",
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
@@ -318,6 +355,7 @@
        layer:'单片模式',
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',
        fileUpload:'文件上传'

    },
    searchOrder:{
@@ -345,7 +383,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -376,7 +415,7 @@
        TrademarkAttribute:'商标参数',
        TrademarkOptions:'商标选项',
        xImage:'X轴镜像',
        yImage:'y轴镜像',
        yImage:'Y轴镜像',
        modifyTrademark:'修改商标',
        tag:'打标使能',
        tag2:'二维码打印1',
@@ -385,7 +424,10 @@
        yMargin:'高方向坐标',
        location:'商标位置',
        sort:'玻璃反弯',
        archRise:'拱高'
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },

@@ -418,6 +460,8 @@
            selectDetailProcessCard:"流程卡明细查询"

        },
        yesTitle:'有标题打印',
        noTitle:'无标题打印',
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
@@ -552,7 +596,25 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        glassId:'玻璃编号',
        polysId:'小片序号',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -640,7 +702,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'请选择责任班组',
        selectWorkReportingTeam:'请选择责任班组',
        successfulModificationOfWorkApplication:'报工修改成功',
@@ -672,6 +734,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -779,6 +852,11 @@
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过流程卡总数',
        boxingPrinting:'装箱打印',
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -856,6 +934,9 @@
        freightQuantity:'运费数量',
        freight:'运费金额',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',
        orderAdd:'订单添加',

    },
    replenish:{
@@ -873,7 +954,8 @@
        sliceMarking:'片标记',
        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'
        listLabelTemplates:'标签模板列表',
        label:'小片标签',
    },
    rework:{
        page:{
@@ -894,6 +976,7 @@
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
        msg1:'请填入需要合并的层',
    },


@@ -939,10 +1022,19 @@
        changeUserName:'修改用户名称',
        userNameCannotBeEmpty:'用户名称不能为空',
    },
    userLog:{
        page:{
            userListLog:'日志首页',
        },
        loginName:'登录名',
        userName:'用户名',
        loginDate:'登录时间',
    },
    orderBasicData:{
        page:{
            searchOrderBasicData:'基础类型',
            searchGlassType:'玻璃类别',
            searchProcessAttributeConfig:'工艺属性类别',
        },
        glassCategory:'玻璃类别',
        order:'订单',
@@ -983,6 +1075,9 @@
        laminatingProcessB:'中空后合片工序',
        laminatingProcessC:'夹胶工序',
        laminatingProcessD:'中空工序',
        please1:'请选择类别',
        please2:'请输入名称',
        please3:'请输入别名',
    },
    machine:{
        page:{
@@ -1046,16 +1141,20 @@
            finishedProductReport :'成品报表',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        productionReport:'生产报表',
        workInProgressReport:'在制品明细报表',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
        processToBeCompleted:'工序待完成报表',
        productionAndShippingProgress:'生产发货进度报表',
        processCardProgress:'流程卡进度报表',
        orderPlanDecomposition:'订单计划分解报表',
        secondaryBrokenReport:'次破报表',
        crossProcessBreakdown:'跨工序次破报表',
        notCrossProcessBreakdown:'非跨工序次破报表',
        secondaryBrokenTotal:'次破总报表',
        teamOutput:'班组产量报表',
        splittingDetails:'分架明细报表',
        TaskCompletionStatus:'任务完成情况报表',
@@ -1063,11 +1162,13 @@
        qualityReport:'品质报表',
        productionScheduling:'排产计划报表',
        yieldReport:'成品率报表',
        yieldProcessReport:'成品率工序汇总报表',
        workingProcedure:'工序',
        inventoryArea:'库存面积',
        pleaseSelectADateFirst:'请先选择日期',
        pleaseSelectAProcessFirst:'请先选择工序',
        theFilteringTimeForExportCannotExceed180Days:'导出的筛选时间不能超过180天',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'下单时间',
        deliveryDate:'交货日期',
        completedQuantity:'已完成数量',
@@ -1092,7 +1193,8 @@
        finishedProductReport :'成品报表',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
@@ -1128,6 +1230,7 @@
        pleaseEnter :'请输入',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1181,7 +1284,11 @@
        surplusMaterialManagement :'余料管理',
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型'
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1209,6 +1316,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'新增标签名',
@@ -1259,7 +1368,9 @@
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{
@@ -1279,6 +1390,61 @@
        addProduce:'选择产品',
        reorder:'转订单',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'库存区域不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'可用数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }