Merge branch 'master' of http://code.dashoo.cn/dashoo/biobank

# Conflicts:
#	src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -550,6 +550,7 @@
           .then(res => {
             this.EquipmentList = res.data
           })
+        this.$refs.multipleTable.doLayout()
       },
       GetEquipmentInfos () {
         service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
@@ -594,6 +595,7 @@
         }
         this.currentPage = 1
         this.initData()
+        this.dialogVisible = false
       },
       // 关闭自定义查询
       closeDialog () {

src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue

@@ -83,10 +83,24 @@
             <template v-else-if="item.filed === 'SurveyDate'">
               {{Jstimehandle(scope.row[item.filed])}}
             </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>
+
           </template>
+
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -354,6 +368,7 @@
         size: 200, // 每页显示数量
         list: [], // table显示数据集
         BarCode: '', // 样本条码
+        ExpandInfoList: [], // 扩展字段列表
         SampleCode: '', // 样本编码
         SampleType: '', // 样本类型
         Stnotevalue: '', // 特有扩展检索值
@@ -669,6 +684,11 @@
           .then(res => {
             this.EquipmentList = res.data
           })
+        this.$refs.multipleTable.doLayout()
+        service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
+          .then(res => {
+            this.ExpandInfoList = res.data
+          })
       },
       GetEquipmentInfos () {
         service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
@@ -703,6 +723,7 @@
       seachdata () {
         this.currentPage = 1
         this.initData()
+        this.dialogVisible = false
       },
       selsampletypeChange () {
         // 获取特有扩展

src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -625,6 +625,7 @@
           .then(res => {
             this.EquipmentList = res.data
           })
+        this.$refs.multipleTable.doLayout()
       },
       GetEquipmentInfos () {
         service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
@@ -665,6 +666,7 @@
       seachdata () {
         this.currentPage = 1
         this.initData()
+        this.dialogVisible = false
       },
       selsampletypeChange () {
         // 获取特有扩展