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

guoyuji

2024-04-09 9a5d0d77d23c5c7e95623aced4d4cfa2490b895b

 north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue

@@ -174,14 +174,13 @@
        max-height="100%"
        v-bind="gridOptions"
        v-on="teamGridEvents"
        @filter-change="filterChanged"

    >

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
            <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>