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

guoyuji

2024-04-08 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3

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

@@ -171,7 +171,7 @@
    {type: 'checkbox', fixed: "left", title: t('basicData.check')},
    {
      field: 'orderNumber',
      title: t('basicData.check'),
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -288,7 +288,7 @@
    },
    {
      field: 'landingSequence',
      title: t('processCard.technologyNumber'),
      title: '落架顺序',
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -668,6 +668,7 @@
              ref="xGridLeft"
              class="mytable-scrollbar"
              max-height="100%"
              height="650px"
              v-bind="gridLeftOptions"
              v-on="gridEvents"
          >
@@ -722,6 +723,7 @@
                ref="xGrid"
                class="mytable-scrollbar"
                max-height="100%"
                height="650px"
                v-bind="gridOptions"
            >
              <!--      @toolbar-button-click="toolbarButtonClickEvent"-->