代码合并

dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue

@@ -8,13 +8,14 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
-    <div>
+    <div style="margin-bottom: 20px;">
       <!--certificateList-->
-      <div class="item_ckquery">
+      <div class="item_ckquery" :style="height?'height:'+height+'':'height: 60px'">
         <template v-for="(item,index) in certificateList">
           <span :class="{'color_text':queryParams.qualificationType === item.qualificationType}" @click="changeType(item.qualificationType)">{{item.qualificationName}}（{{item.companyCount}}）</span>
         </template>
       </div>
+      <el-divider v-if="certificateList.length > 10 && !height" @click="moreClick()">更多<span></span></el-divider>
     </div>
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
@@ -75,7 +76,8 @@
         tableDataTotal:0,
         title:'',
         rowData:'',
-        certificateList:[]
+        certificateList:[],
+        height:''
       }
     },
     created() {
@@ -120,6 +122,9 @@
         this.queryParams.pageSize=20;
         this.handleQuery()
       },
+      moreClick(){
+        this.height='auto'
+      },
 
     }
   }
@@ -139,6 +144,7 @@
     .item_ckquery{
       position: relative;
       margin-bottom: 10px;
+      overflow: hidden;
       span{
         color: #232323;
         padding: 3px 10px;
@@ -177,5 +183,28 @@
         background: #F0F3FA;
       }
     }
+    ::v-deep .el-divider{
+      /*width: calc(100% - 107px);*/
+      margin-top: 12px;
+      .el-divider__text{
+        cursor: pointer;
+        span{
+          display: inline-block;
+          width: 16px;
+          height: 16px;
+          position: relative;
+          top: 2px;
+          background: url('../../../../assets/images/down.png');
+          background-size:  16px 16px;
+        }
+        &:hover{
+          color: #0081FF;
+          span{
+            background: url('../../../../assets/images/down1.png');
+            background-size:  16px 16px;
+          }
+        }
+      }
+    }
   }
 </style>

dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue

@@ -142,7 +142,6 @@
               :summary-method="getSummaries"
               fit
               highlight-current-row
-              :default-sort = "{prop: 'count', order: 'descending'}"
             >
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -22,7 +22,6 @@
               :summary-method="getSummaries"
               fit
               highlight-current-row
-              :default-sort = "{prop: 'count', order: 'descending'}"
             >
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -59,7 +58,6 @@
               :summary-method="getSummaries"
               fit
               highlight-current-row
-              :default-sort = "{prop: 'count', order: 'descending'}"
             >
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -98,7 +96,6 @@
               :summary-method="getSummaries"
               fit
               highlight-current-row
-              :default-sort = "{prop: 'count', order: 'descending'}"
             >
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -25,7 +25,6 @@
             :summary-method="getSummaries"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -66,7 +65,6 @@
             :summary-method="getSummaries"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -107,7 +105,6 @@
             :summary-method="getSummaries"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -143,7 +140,6 @@
             :summary-method="getSummaries"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -182,7 +178,6 @@
             :summary-method="getSummaries1"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -225,7 +220,6 @@
             :summary-method="getSummaries2"
             fit
             highlight-current-row
-            :default-sort = "{prop: 'count', order: 'descending'}"
           >
             <el-table-column label="序号" width="60">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>