Merge branch 'sit'

src/components/globalComponents/ex-table/main.vue

@@ -118,7 +118,7 @@
     />
   -->
     <div
-      v-if="page !== false && data && data.length > 0"
+      v-if="data && data.length > 0"
       class="Pagination"
       style="text-align: right; margin-top: 10px"
     >
@@ -216,8 +216,12 @@ export default {
      * page-size-change  分页大小改变
      */
     page: {
-      type: [Boolean, Object],
-      default: false,
+      type: Object,
+      default: {
+        curr: 1,
+        size: 15,
+        total: 0,
+      },
     },
     /**
      * 筛选条件集合
@@ -270,7 +274,28 @@ export default {
       tableSelection: [],
     };
   },
-  watch: {},
+  computed: {
+    page_curr() {
+      return this.page.curr;
+    },
+    page_size() {
+      return this.page.size;
+    },
+    page_total() {
+      return this.page.total;
+    },
+  },
+  watch: {
+    page_curr: function (val) {
+      this.page.curr = val;
+    },
+    page_size: function (val) {
+      this.page.size = val;
+    },
+    page_total: function (val) {
+      this.page.total = val;
+    },
+  },
   mounted() {
     // 拖拽绑定
     this.rowDrop();

src/mixins/elPaginationHandle.js

@@ -2,11 +2,13 @@ export default {
   methods: {
     async handlePageChange(val) {
       this.parmValue.page = val
+      this.pageInfo.curr = val
       await this.searchList()
     },
     async handleSizeChange(val) {
       this.parmValue.page = 1
-      this.parmValue.size = val
+      this.pageInfo.curr = 1
+      this.pageInfo.size = val
       await this.searchList()
     }
   }

src/views/interest/account/index.vue

@@ -5,9 +5,6 @@
     >
       <ex-table
         v-loading="loading"
-        v-if="
-          powers && powers.length > 0 && powers.some((item) => item == '001')
-        "
         :table="table"
         :data="tableData"
         :columns="columns"