Merge branch 'hotfix_zcy_0311' into 'master'

回销管理表格滚动问题修复

See merge request !90

src/views/verification/collectionDetail.vue

@@ -14,7 +14,7 @@
                     allow-clear
                     show-search
                     :disabled="!isEdit"
-                    style="min-width: 200px; max-width: 250px"
+                    style="width: 200px"
                     @change="changePayor"
                     :filterOption="filterCode"
                   >
@@ -133,8 +133,9 @@
                     placeholder="请选择保险公司"
                     allow-clear
                     show-search
+                    :dropdownMatchSelectWidth="false"
                     :disabled="!isEdit"
-                    style="min-width: 200px"
+                    style="width: 200px"
                     @change="changePayor"
                     :filterOption="filterCode"
                   >
@@ -807,8 +808,8 @@ export default {
       const paddingT = parseFloat(style.getPropertyValue('padding-top'))
       const paddingB = parseFloat(style.getPropertyValue('padding-bottom'))
       const paddingSum = paddingT + paddingB
-      this.tableHeight = containterH - 300 - gobackH - paddingSum
-      this.tableHeight1 = containterH - 340 - gobackH - paddingSum
+      this.tableHeight = containterH - 380 - gobackH - paddingSum
+      this.tableHeight1 = containterH - 420 - gobackH - paddingSum
       // 设置每页展示条数
       const pageSize = Math.floor((this.tableHeight1 - 10) / 32)
       this.$set(this.pagination, 'pageSize', pageSize)