|
|
@@ -76,11 +76,18 @@
|
|
|
<template v-else-if="item.filed === 'SurveyDate'">
|
|
|
{{Jstimehandle(scope.row[item.filed])}}
|
|
|
</template>
|
|
|
- <!-- <template v-else-if="item.filed === 'Location'">
|
|
|
- <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage_new' + getstationurl(scope.row)">
|
|
|
- {{scope.row.ECode}}-{{numtoupchar(scope.row.ShelfY)}}{{scope.row.ShelfX}}-{{numtoupchar(scope.row.BoxY)}}{{scope.row.BoxX}}-{{postiontoupchar(scope.row.Position)}}
|
|
|
- </router-link>
|
|
|
- </template> -->
|
|
|
+ <template v-else-if="item.filed === 'Genus'">
|
|
|
+ <el-popover trigger="hover" placement="top">
|
|
|
+ <template v-for="item in ExpandInfoList">
|
|
|
+ <p v-if="scope.row[item.FieldName] != '' && scope.row.SampleType == item.SampleType">
|
|
|
+ {{item.Name}}:{{scope.row[item.FieldName]}}
|
|
|
+ </p>
|
|
|
+ </template>
|
|
|
+ <div slot="reference" class="name-wrapper">
|
|
|
+ <el-tag size="medium">{{ scope.row[item.filed] }}</el-tag>
|
|
|
+ </div>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
<template v-else>
|
|
|
{{scope.row[item.filed]}}
|
|
|
</template>
|