Merge remote-tracking branch 'origin/master'

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

@@ -566,7 +566,6 @@ export default {
         .then(res => {
           this.EquipmentList = res.data
         })
-      /* this.$refs.multipleTable.doLayout() */
       // 获取样本扩展列表
       service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
         .then(res => {
@@ -577,6 +576,9 @@ export default {
         .then(res => {
           this.SampleTypeList = res.data
         })
+      this.$nextTick(() => {
+        this.$refs.multipleTable.doLayout()
+      })
     },
     GetEquipmentInfos () {
       if (this.DItem != '') {

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

@@ -593,7 +593,6 @@
           .then(res => {
             this.EquipmentList = res.data
           })
-        this.$refs.multipleTable.doLayout()
         // 获取样本扩展列表
         service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
           .then(res => {
@@ -604,6 +603,9 @@
           .then(res => {
             this.SampleTypeList = res.data
           })
+        this.$nextTick(() => {
+          this.$refs.multipleTable.doLayout()
+        })
       },
       /* GetEquipmentInfos () {
         if (this.DItem != '') {

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

@@ -654,7 +654,6 @@
           .then(res => {
             this.EquipmentList = res.data
           })
-        this.$refs.multipleTable.doLayout()
         // 获取样本扩展列表
         service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
           .then(res => {
@@ -665,6 +664,9 @@
           .then(res => {
             this.SampleTypeList = res.data
           })
+        this.$nextTick(() => {
+          this.$refs.multipleTable.doLayout()
+        });
       },
       GetEquipmentInfos () {
         if (this.DItem != '') {

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

@@ -556,7 +556,6 @@
           .then(res => {
             this.EquipmentList = res.data
           })
-        this.$refs.multipleTable.doLayout()
         // 获取样本扩展列表
         service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
           .then(res => {
@@ -567,6 +566,9 @@
           .then(res => {
             this.SampleTypeList = res.data
           })
+        this.$nextTick(() => {
+          this.$refs.multipleTable.doLayout()
+        })
       },
       GetEquipmentInfos () {
         if (this.DItem != '') {