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

廖井涛

2024-03-27 59ef6e9b5b8aff7614711c2afdba23a460ac1c56

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

@@ -90,7 +90,8 @@
        shape:'Shape',
        bendRadius:'Bend Radius',
        edgingType:'Edging Type',
        import:'import',
        import:'Import',
        template:'Template',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -126,6 +127,12 @@
        msgDeleteSuccess:'Successfully delete',
        deleteConfirm:'Confirm order deletion?',
        orderType:'Order Type',
        processFlows:'Process flows:',
        copy:'Copy',
        copyTitle:'Copy Title',
        msgList:{
            checkOrder:'No order information is found. Please click Order first'
        }
    },
    craft:{
        glassAddress:'Glass Address',
@@ -144,6 +151,7 @@
        oldProcess:'Old Process',
        newProcess:'New Process',
        reset:'Reset',
        sure:'Sure',
    },
    workOrder:{
        workOrder:'Work Order Management',