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

chenlu

2025-07-29 65b701e9e14c932a93a28ad95944cb64ff05d0bb

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

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

@@ -252,6 +252,8 @@
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        graphic:'图形',
        drawingNo:'图号',
        msg:{
            productCheck:'الرجاء اختيار منتج',
            tableLengthNot:'لا توجد بيانات للجدول',

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

@@ -252,6 +252,8 @@
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        graphic:'graphic',
        drawingNo:'drawingNo',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',

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

@@ -251,6 +251,9 @@
        quantityMount:'수량 기준 금액',
        allAmount:'총 면적 금액',
        orderTransfer:'주문 이관',

        graphic:'graphic',
        drawingNo:'drawingNo',
        transferPage:{
            oldOrderId:'기존 주문 번호',
            newOrderId:'신규 주문 번호',

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

@@ -252,6 +252,8 @@
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        graphic:'图形',
        drawingNo:'图号',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
            tableLengthNot:'Нет данных таблицы',

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

@@ -251,6 +251,9 @@
        quantityMount:'数量金额',
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        graphic:'图形',
        drawingNo:'图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -131,7 +131,7 @@
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true },
          { code: 'uploadPicture', name: 'Upload Picture',  visible: true, }
          { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-send',  visible: true, }
        ]
      ]
    }
@@ -184,7 +184,7 @@
    {field: 'bendRadius',width:160,  title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'edgingType',width:160,  title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'processingNote',width:200,  title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'fileName',width:200,  title: t('文件名称'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'fileName',width:200,  title: t('order.drawingNo'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'remarks',width:140,  title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},