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

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

 north-glass-erp/northglass-erp/src/lang/kr.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:{
@@ -366,7 +385,6 @@
            isStorage:'입고 완료된 주문은 시스템 되돌리기가 불가능 합니다.',
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?',
            filterError:'请输入正确格式的筛选条件'

        },
        updateOrderId:'주문 번호 수정',
        reportingTransfer:'작업 실적 이관'
@@ -586,6 +604,8 @@
        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        glassId:'玻璃编号',
        polysId:'小片序号',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
@@ -916,6 +936,7 @@
        pleaseMsg1:'주문서 기타금액 단가가 기입되지 않았습니다',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',
        orderAdd:'订单添加',

    },
    replenish:{
@@ -1001,10 +1022,19 @@
        changeUserName:'사용자 명 수정',
        userNameCannotBeEmpty:'사용자 이름은 필수 입력 항목입니다',
    },
    userLog:{
        page:{
            userListLog:'日志首页',
        },
        loginName:'登录名',
        userName:'用户名',
        loginDate:'登录时间',
    },
    orderBasicData:{
        page:{
            searchOrderBasicData:'기본 유형',
            searchGlassType:'유리 분류',
            searchProcessAttributeConfig:'工艺属性类别',
        },
        glassCategory:'유리 분류',
        order:'주문 관리',
@@ -1045,6 +1075,9 @@
        laminatingProcessB:'중공 후 접합 공정',
        laminatingProcessC:'적층 공정',
        laminatingProcessD:'중공 유리 제조 공정',
        please1:'请选择类别',
        please2:'请输入名称',
        please3:'请输入别名',
    },
    machine:{
        page:{