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

廖井涛

77 分钟以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -242,6 +242,13 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    // {
    //   field: 'order_id',
    //   title: t('order.orderId'),
    //   filters: [{data: ''}],
    //   slots: {filter: 'num1_filter'},
    //   filterMethod: filterChanged
    // },
    {
      field: 'glass_thickness',
      title: t('order.totalThickness'),