合并冲突

licp

2024-06-20 b482e6081bfe182421be331ab190de1e1307e72f

 src/components/view/b2-standard.vue

@@ -231,6 +231,7 @@
          @select="upProductSelect" @select-all="handleAll" class="productTable" header-row-class-name="header-class">
          <el-table-column type="selection" width="50">
          </el-table-column>
          <el-table-column prop="sample" label="产品" min-width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="model" label="型号" min-width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
          <!-- <el-table-column prop="inspectionItemClassify" label="检验项类型" width="120" show-overflow-tooltip></el-table-column> -->
@@ -428,6 +429,7 @@
            header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
            <el-table-column type="selection" width="50">
            </el-table-column>
            <el-table-column prop="sample" label="产品" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="model" label="型号" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip :filters="filters0"
              :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
@@ -703,7 +705,7 @@
      getNodeParent(val) {
        if (val.parent != null) {
          if(val.data.children === null){
            this.selectTree += ' - ' + val.label + ' - ' + ''
            this.selectTree += ' - ' + val.label + ' - ' + 'null'
          }else{
            this.selectTree += ' - ' + val.label
          }