Merge branch 'dev1.2.0' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into 1.2.0

src/components/CommTable/index.vue

@@ -343,7 +343,7 @@ export default {
         }
       },
       immediate: true
-    }
+    },
   },
   mounted() {
     if (this.$refs.tableRef) this.$refs.tableRef.columns.map(item => (item.className = item.className ? item.className + ' ' + item.property : item.property))
@@ -425,6 +425,10 @@ export default {
         })
         this.multipleSelection = list
       })
+    },
+    initPage() {
+      this.page = 1
+      this.size = 10
     }
   }
 }

src/views/capitalFinancingManage/loanMoney/index.vue

@@ -76,8 +76,6 @@ export default {
       loading: false,
       activeName: 'pending',
       tableData: [],
-      page: 1,
-      size: 10,
       total: 0,
       search: {
         fastSearch: '',
@@ -183,7 +181,6 @@ export default {
           label: '操作',
           show: true,
           render: (h, row) => {
-            console.log(this)
             const btnList = [
               // {
               //   msg: '时间进度轴',
@@ -268,10 +265,10 @@ export default {
   },
   methods: {
     async fetchData(type) {
-      console.log(type)
       if (type === 'search') {
         this.page = 1
         this.size = 10
+        this.$refs.commTable.initPage()
       }
 
       this.loading = true