Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-19 8f53694cc7ed5b9965d172a511ab39b914edbfb6

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

@@ -2,12 +2,12 @@
    login:{
        userErr:'请输入你的账号',
        pwErr:'请输入你的密码',
        loginSuccessful:'登陆成功',
        loginSuccessful:'登录成功',
        connectErr:'服务器连接失败',
        user:'用户',
        password:'密码',
        SysName:'北玻自动化ERP管理系统',
        login:'登陆',
        login:'登录',
        register:'注册',
    },
    main:{
@@ -23,6 +23,8 @@
        add:'添加',
        delete:'删除',
        edit:'编辑',
        cancel:'作废',
        restore:'还原',
        selectSame:'选中相同',
        sameAfterwards:'之后相同',
        clearSelection:'清除选中',
@@ -48,6 +50,61 @@
            ReviewSuccess:'审核成功'
        }
    },
    product:{
       ProductHomePage:'产品首页',
       create:'创建',
       msg:{
           productLength:'请添加产品详情',
           lastGlass:'产品详情最后一条不是玻璃，请完善',
           glassType:'请选择产品类别',
           saveSuccess: '创建成功',
           operateSuccess: '操作成功',
           operateFail: '操作失败',
           glassReview:'请输入产品材料属性与工艺属性',
           glassRepeat:'请先选择间隔物',
           HollowReview:'请选择全部中空间隔物下拉框',
           firstGlass:"请先选择产品",
           InterlayerReview:'请选择全部中空间隔物下拉框',
           glassTypeTitle:'材料属性',
           thickness:'*厚度',
           color:'*颜色',
           craft:'*工艺属性',
           location:'*位置',
           lowELocation:'LOW-E面',
           processAttribute:"工艺属性",
           hollowThickness:'*中空厚度',
           hollowGasType:'*充气方式:',
           hollowType:'*封胶',
           hollowGlueDepth:'*默认胶深:',
           hollow:'中空间隔物',
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',
           interlayerType:'*类型',
           interlayerColor:'*颜色',
           interlayer:'夹层间隔物',
           interlayerUpdate:'夹层间隔物修改',
           glassAttribute:'单片玻璃属性:',
           reset:'重置',
           processFlowAttribute:'工艺流程属性:',
           sure:'确认',
           update:'修改',
           quickSearch:'快速查询',
           weightThickness:'计重厚度',
           allThickness:'厚度',
           remarks:'备注',
           product:'产品名称:',
           updateGlass:'修改玻璃',
           updateHollow:'修改中空',
           updateInterlayer:'修改夹层',
           delete: '删除',
           create:'创建',
           review:'审核',
           cancelReview:'反审',
       }


    },

    order:{
        orderHomePage:'订单首页',
        orderReport:'订单报表',
@@ -81,7 +138,7 @@
        width:'宽',
        height:'高',
        area:'面积',
        trueArea:'实际单片金额',
        trueArea:'实际单片面积',
        trueGrossArea:'实际总面积',
        computeArea:'结算单片面积',
        computeGrossArea:'计算总面积',
@@ -89,6 +146,7 @@
        bendRadius:'弯钢弧度',
        edgingType:'磨边类型',
        import:'导入',
        template:'模板',
        msg:{
            productCheck:'请选择产品',
            tableLengthNot:'没有表格数据',
@@ -102,7 +160,8 @@
            importMaxCheckFailFirst:'导入',
            importMaxCheckFailMid:'条,$数据不能超过',
            importMaxCheckFailLast:'条,请分订单导入',
            updateAmountSuccessfully:'更新金额成功'
            updateAmountSuccessfully:'更新金额成功',
            updateOrderState:'更新订单状态成功',
        }

    },
@@ -123,6 +182,12 @@
        msgDeleteSuccess:'删除成功',
        deleteConfirm:'确认删除订单?',
        orderType:'订单类型',
        processFlows:'流程卡进度',
        copy:'复制订单',
        copyTitle:'复制表头',
        msgList:{
            checkOrder:'未查询到订单信息，请先单击订单'
        }

    },
    craft:{
@@ -142,6 +207,16 @@
        oldProcess:'原流程',
        newProcess:'流程',
        reset:'重置',
        sure:'确定',
        // upperLeft:'左上',
        // upperRight:'右上',
        // lowLeft:'左下',
        // lowRight:'右下',
        // TrademarkAttribute:'商标参数',
        // TrademarkOptions:'商标选项',
        // xImage:'X轴镜像',
        // yImage:'X轴镜像'

    },

    workOrder:{