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

@@ -76,6 +76,7 @@
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        otherColumns:'其他列',
        msg:{
            max255:"最多输入255个字符",
            max10:"最多输入10个字符",
@@ -327,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:'模糊模式',
@@ -337,6 +355,7 @@
        layer:'单片模式',
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',
        fileUpload:'文件上传'

    },
    searchOrder:{
@@ -364,7 +383,8 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -584,6 +604,8 @@
        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        glassId:'玻璃编号',
        polysId:'小片序号',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
@@ -914,6 +936,7 @@
        pleaseMsg1:'订单存在其他金额单价没有填写',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',
        orderAdd:'订单添加',

    },
    replenish:{
@@ -999,10 +1022,19 @@
        changeUserName:'修改用户名称',
        userNameCannotBeEmpty:'用户名称不能为空',
    },
    userLog:{
        page:{
            userListLog:'日志首页',
        },
        loginName:'登录名',
        userName:'用户名',
        loginDate:'登录时间',
    },
    orderBasicData:{
        page:{
            searchOrderBasicData:'基础类型',
            searchGlassType:'玻璃类别',
            searchProcessAttributeConfig:'工艺属性类别',
        },
        glassCategory:'玻璃类别',
        order:'订单',
@@ -1043,6 +1075,9 @@
        laminatingProcessB:'中空后合片工序',
        laminatingProcessC:'夹胶工序',
        laminatingProcessD:'中空工序',
        please1:'请选择类别',
        please2:'请输入名称',
        please3:'请输入别名',
    },
    machine:{
        page:{
@@ -1158,7 +1193,8 @@
        finishedProductReport :'成品报表',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
@@ -1333,7 +1369,8 @@
        userPassWord :'修改密码',
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{