Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-08 7104751e2f26872d4891d01d42ee88cf19715d01

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

@@ -68,6 +68,7 @@
        selected:'选中',
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',
        msg:{
            max255:"最多输入255个字符",
            range99999Dec2:
@@ -124,7 +125,7 @@
           glassRepeat:'请先选择间隔物',
           HollowReview:'请选择全部中空间隔物下拉框',
           firstGlass:"请先选择产品",
           InterlayerReview:'请选择全部中空间隔物下拉框',
           InterlayerReview:'请选择全部间隔物带星号下拉框',
           glassTypeTitle:'材料属性',
           thickness:'*厚度',
           color:'*颜色',
@@ -135,12 +136,12 @@
           hollowThickness:'*中空厚度',
           hollowGasType:'*充气方式:',
           hollowType:'*封胶',
           hollowGlueDepth:'*默认胶深:',
           hollowGlueDepth:'默认胶深:',
           hollow:'中空间隔物',
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',
           interlayerType:'*类型',
           interlayerColor:'*颜色',
           interlayerColor:'颜色',
           interlayer:'夹层间隔物',
           interlayerUpdate:'夹层间隔物修改',
           glassAttribute:'单片玻璃属性:',
@@ -245,8 +246,20 @@
        sheet3:'浏览发货信息',
        sheet5:'生产加工单弯钢(单片)',
        oneClickStorage:'一键完工',
        oneClickReturn:'一键退回',

        quantityMount:'数量金额',
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
            oldOrderNumber:'原订单序号',
            newOrderNumber:'新订单序号',
            confirmTitle:'确实转移此序号的流程卡报工数据?',
            errorToMes:'与mes通讯异常'

        },

        msg:{
            productCheck:'请选择产品',
@@ -273,7 +286,18 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
        }
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'

    },
    searchOrder:{
@@ -297,8 +321,14 @@
        copy:'复制订单',
        copyTitle:'复制表头',
        msgList:{
            checkOrder:'未查询到订单信息，请先单击订单'
        }
            checkOrder:'未查询到订单信息，请先单击订单',
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'标记',
@@ -331,9 +361,10 @@
        tag:'打标使能',
        tag2:'二维码打印1',
        tag3:'二维码打印2',
        xMargin:'X轴边距',
        yMargin:'Y轴边距',
        xMargin:'宽方向坐标',
        yMargin:'高方向坐标',
        location:'商标位置',
        sort:'玻璃反弯'

    },

@@ -349,7 +380,8 @@
        transferOrder:'转工单',
        perimeter:'周长',
        deleteNo:'删除失败，检查是否已分架',
        msg:'请选择所有数据'
        msg:'请选择所有数据',
        msgSelect:'请选择订单号'

    },
    processCard:{
@@ -365,6 +397,8 @@
            selectDetailProcessCard:"流程卡明细查询"

        },
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'流程卡号',
        founder:'分架员',
        layoutStatus:'排版状态',
@@ -412,6 +446,7 @@
        composingOk:'可排版',
        composingNo:'不可排版',
        typesetter:'已排版',
        revoke:'撤销可排版',
        scheduledStartTime:'计划开始时间',
        planEndTime:'计划结束时间',
        customerId:'客户编码',
@@ -433,6 +468,7 @@
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，请检查下工序是否已报工或者已补片返工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',
        notSelectTheOptionData:'请勿勾选已排版数据',
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
@@ -453,7 +489,7 @@
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        editablePrinting:'标签自定义打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
@@ -463,7 +499,32 @@
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'
        printWarn1:'打印数量不能大于订单数量',
        depthShelf:"架子纵深(mm)",
        shelfCapacity:"架子承重(KG)",
        IntervalThickness:"间隔厚度(mm)",
        LongestLargestMax:"长边最大(mm)",
        LongestShortestMax:"长边最短(mm)",
        quantityMax:"最大数量",
        shortestLongest:"短边最大(mm)",
        shortestSide:"短边最短(mm)",
        intelligentBranching:"智能分架",
        reset:"重置",
        combinedFrame:"合架",
        shelfNumber:'架号',
        totalSequenceNumber:'总序号',
        cancelMerger:'取消合并',
        projectMsg1:'请选择工程对应的版图号',
        orderPrint:'订单打印',
        numberLabelPrintingOperations:'标签打印次数',
        numberTimesProcessCardPrinted:'流程卡打印次数',
        projectMsg2:'请选择标签模板',
        layoutNumber:'版图号',
        addFlowCardMsg1:'请选择已分架订单打印',
        addFlowCardMsg2:'请选择未分架订单打印',
        okFlowCard:'已分架',
        noFlowCard:'未分架',


    },
    reportingWorks:{
@@ -472,6 +533,9 @@
            addReportingWork:"报工新增",
            qualityInspectionReview:"质检审核",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'编号',
        glassAddress:'片标记',
        WorkReportingManagement:'报工管理',
@@ -545,6 +609,7 @@
        thisWornQuantity:'本工序次破',
        passAudit:'审核通过',
        patchCondition:'补片状态',
        changeFailed:'修改失败，请检查是否为报工转移订单',


        selectResponsibleTeam:'请选择责任班组',
@@ -678,7 +743,8 @@
        boxNumber:'箱号',
        msg1:'发货单已出库请刷新界面',
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过订单总数'
        msg3:'入库数量不能超过订单总数',
        boxingPrinting:'装箱打印',
    },
    customer:{
        page:{
@@ -705,6 +771,9 @@

        customerAbbreviation:'客户简称',
        pleaseEnterTheCustomerAbbreviation:'请输入客户简称',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
@@ -768,7 +837,9 @@
        patchNumber:'补片单号',
        mark:'标记',
        sliceMarking:'片标记',

        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'
    },
    rework:{
        page:{
@@ -817,6 +888,7 @@
        userId:'用户ID',
        user:'用户',
        setUpRoles:'设置角色',
        setProcess:'设置工序',
        changePassword:'修改密码',
        OldPassword:'旧密码',
        TheNewPassword:'新密码',
@@ -872,6 +944,11 @@
        msg2:'上传图片只能是 JPG或者PNG 格式!',
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcessA:'夹胶后合片工序',
        laminatingProcessB:'中空后合片工序',
        laminatingProcessC:'夹胶工序',
        laminatingProcessD:'中空工序',
    },
    machine:{
        page:{
@@ -933,7 +1010,9 @@
            productionScheduling:'排产计划报表',
            yield:'成品率报表',
            finishedProductReport :'成品报表',
            orderWorkReportForm :'订单报工报表',
        },
        teamsGroupsName:'上工序报工',
        productionReport:'生产报表',
        workInProgressReport:'在制品报表',
        processToBeCompleted:'工序待完成报表',
@@ -976,6 +1055,7 @@
        patchNum :'补片数量',
        finished :'成品率',
        finishedProductReport :'成品报表',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{
@@ -1089,6 +1169,8 @@
        materialAdditionReport:"物料新增报表",
        materialOutboundReport:"物料出库报表",
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
    },
    components:{
        addNewSignature :'新增标签名',
@@ -1138,7 +1220,8 @@
        user :'用户列表',
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格'
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
    },

    glassPrice:{