Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-31 defa824eab2350fd6abfd10abd8f4df94749e336

 src/components/do/b1-sample/detail.vue

@@ -66,12 +66,12 @@
            </el-table-column>
            <el-table-column prop="inspectionItem" label="检验项" min-width="100"
               show-overflow-tooltip></el-table-column>
            <el-table-column prop="inspectionItemSubclass" label="检验项分类" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="inspectionItemSubclass" label="检验项分类" min-width="100" show-overflow-tooltip v-if="PROJECT=='装备电缆'"></el-table-column>
            <el-table-column prop="laboratory" label="实验室" min-min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="unit" label="单位" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="equipName" label="设备" min-width="100" show-overflow-tooltip>
            <el-table-column prop="equipValue" label="设备" min-width="100" show-overflow-tooltip>
          <template slot-scope="scope">
            {{handleData(scope.row.equipName)}}
            {{handleData(scope.row.equipValue)}}
          </template>
        </el-table-column>
            <el-table-column prop="entrustCode" label="委托编号" min-width="100" show-overflow-tooltip></el-table-column>
@@ -135,9 +135,12 @@
      })
    },
    handleData(e){
      let info = JSON.parse(e).map(item => {
      let info = ''
      if(e){
        info = JSON.parse(e).map(item => {
        return item.v;
      }).join(',')
      }
      return info
    }
  }