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

廖井涛

2025-03-26 7a0527e207c59cdcce0b1f7a41bd7457a236ab23

 north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue

@@ -260,6 +260,14 @@
      sortable: true,width: 100
    },
    {
      field: 'bend_radius',
      title: t('order.bendRadius'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true,width: 120
    },
    {
      field: 'area',
      title: t('order.area'),
      filters: [{data: ''}],
@@ -497,6 +505,7 @@
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="text"
                   v-model="option.data"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>