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

廖井涛

2024-07-05 615d0a9e2011510b589ccc3b4bc58894a39e8295

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

@@ -91,6 +91,8 @@
        typeName:'所属类别',
        query:'快速查询',
        creator:'创建人',

        usingAbbreviations:'使用简称',
       msg:{
           productLength:'请添加产品详情',
           lastGlass:'产品详情最后一条不是玻璃，请完善',
@@ -139,6 +141,8 @@
           review:'审核',
           cancelReview:'反审',
           theProductHasBeenReviewedAndCannotBeDeleted:'产品已审核,无法删除',

           productAbbreviation:'产品简称',
       }
    },
    order:{
@@ -368,9 +372,11 @@
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，检查下工序是否已报工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
        customLabelPrinting:'自定义标签打印',
        labelPrinting:'标签打印',
        sortingSuccessful:'排序成功',
        sorting:'排序',
        pleaseSelect:'请选择',
@@ -380,8 +386,14 @@
        finishedProductLabel:'成品标签',
        halfProductLabel:'半品标签',
        pleaseSelectCustomPrintLabelStyle:'请选择自定义打印标签样式',
        mergePrinting:'合并打印',
        printStatus:'打印状态',
        labelPrinting2:'标签打印2',
        addAutomatically:'自动填充',
        selectFill:'选中填充'
    },
    reportingWorks:{
        glassNumber:'编号',
        glassAddress:'片标记',
        WorkReportingManagement:'报工管理',
        addReportingWorks:'报工新增',
@@ -596,6 +608,8 @@
        customerOrders:'客户订单',
        orderAmount:'订单金额',

        customerAbbreviation:'客户简称',
        pleaseEnterTheCustomerAbbreviation:'请输入客户简称',
    },
    delivery:{
        delivery:'发货',