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

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

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

@@ -76,6 +76,7 @@
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        otherColumns:'其他列',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            max10:"最多输入10个字符",
@@ -177,6 +178,8 @@

            productAbbreviation:'Product abbreviation',
            productDuplication:'Product repetition',
            msg1:'创建人是：',
            msg2:'无法操作！',
        }
    },
    order:{
@@ -283,6 +286,16 @@
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
            oldOrderNumber:'原订单序号',
            newOrderNumber:'新订单序号',
            confirmTitle:'确实转移此序号的流程卡报工数据?',
            errorToMes:'与mes通讯异常'

        },

        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -315,8 +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:'模糊模式',
@@ -326,6 +355,7 @@
        layer:'单片模式',
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',
        fileUpload:'文件上传'

    },
    searchOrder:{
@@ -353,7 +383,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -428,6 +459,8 @@
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        yesTitle:'有标题打印',
        noTitle:'无标题打印',
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
@@ -460,6 +493,7 @@
        reviewedState:'Review Status',
        reviewed:'Reviewer',
        schedulingId:'Production Scheduling Number',
        notes:'Примечания',
        scheduling:'Production Scheduling',
        schedulingOk:'Please select the data on the right first',
        schedulingNo:'Please enter a positive integer',
@@ -530,8 +564,6 @@
        selectFill:'Selected fill',
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',


        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
@@ -564,13 +596,16 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        glassId:'玻璃编号',
        polysId:'小片序号',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
@@ -587,6 +622,9 @@
            addReportingWork:"New Work Reporting",
            qualityInspectionReview:"Quality Inspection Review",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'Code',
        glassAddress:'Glass Address',
        WorkReportingManagement:'Work Reporting Management ',
@@ -664,7 +702,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
        successfulModificationOfWorkApplication:'Report modification succeeded',
@@ -857,7 +895,6 @@
            shipmentProductClassificationReport:"Category report of shipped products ",
            createDelivery:'Create delivery',
            deliveryReport:'Delivery report',

        },
        delivery:'Delivery',
        place :'Place',
@@ -899,6 +936,7 @@
        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',
        orderAdd:'订单添加',

    },
    replenish:{
@@ -907,6 +945,7 @@
            addReplenish:"Add Patches",
            printReplenishFlowCard:"Print Patches"
        },

        patchManagement:'Patch Management',
        addPatches:"Add Patches ",
        printPatches:'Print Patches',
@@ -916,6 +955,7 @@
        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'

    },
    rework:{
        page:{
@@ -965,6 +1005,7 @@
        userId:'User ID',
        user:'User',
        setUpRoles:'Set a role',
        setProcess:'设置工序',
        changePassword:'Change password',
        OldPassword:'Old password',
        TheNewPassword:'New password',
@@ -981,10 +1022,19 @@
        changeUserName:'Modifying a user name',
        userNameCannotBeEmpty:'The user name cannot be empty',
    },
    userLog:{
        page:{
            userListLog:'日志首页',
        },
        loginName:'登录名',
        userName:'用户名',
        loginDate:'登录时间',
    },
    orderBasicData:{
        page:{
            searchOrderBasicData:'Base type',
            searchGlassType:'Type of glass',
            searchProcessAttributeConfig:'工艺属性类别',
        },
        glassCategory:'Type of glass',
        order:'Order',
@@ -1025,6 +1075,9 @@
        laminatingProcessB:'中空后合片工序',
        laminatingProcessC:'夹胶工序',
        laminatingProcessD:'中空工序',
        please1:'请选择类别',
        please2:'请输入名称',
        please3:'请输入别名',
    },
    machine:{
        page:{
@@ -1088,7 +1141,10 @@
            finishedProductReport :'Finished product report',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
        productionReport:'Production report',
        workInProgressReport:'Product in process report',
        processToBeCompleted:'Process to be completed report',
@@ -1104,11 +1160,13 @@
        qualityReport:'Quality statement',
        productionScheduling:'Production scheduling report',
        yieldReport:'Yield report',
        yieldProcessReport:'成品率工序汇总报表',
        workingProcedure:'Process',
        inventoryArea:'Stock area（m²）',
        pleaseSelectADateFirst:'Please select the date first',
        pleaseSelectAProcessFirst:'Please select the process first',
        theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'Order time',
        deliveryDate:'Delivery date',
        completedQuantity:'Quantity completed',
@@ -1133,7 +1191,9 @@
        finishedProductReport :'Finished product report',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
        page:{
@@ -1307,7 +1367,8 @@
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price',
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{