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

chenlu

8 天以前 97fba4a0e38c0b8455d43d2935aa996676407361

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

@@ -364,7 +364,9 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
            BackSure:"确定一键退回相应流程?",
            filterError:'请输入正确格式的筛选条件'

        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -1332,7 +1334,8 @@
        userPassWord :'Изменить пароль',
        glassPrice:'Цена стекла.',
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{