修改

jsowell-ui/src/views/financial/merchant.vue

@@ -52,13 +52,13 @@
                 <template slot-scope="scope"> 
                     <!--  :to="'/merchant/detail/index/' + scope.row.id" -->
                     <router-link
-                        :to="{path:'/financial/merchant/merchantVirtual', query: {merchantId: scope.row.id}} "
+                        :to="{path:'/financial/merchant/merchantVirtual', query: {merchantId: scope.row.id,merchantName:scope.row.merchantName}} "
                         class="link-type"
                     >
                         <span>虚拟财务</span>
                     </router-link>
                     <router-link
-                        :to="{path:'/financial/merchant/cleanFinancial', query: {merchantId: scope.row.id}} "
+                        :to="{path:'/financial/merchant/cleanFinancial', query: {merchantId: scope.row.id,merchantName:scope.row.merchantName}} "
                         class="link-type"
                     >
                         <span style="margin-left:10px;color: darkblue;">清分财务</span>
@@ -66,13 +66,14 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getFinancialMerchantList"
-        />
+
+         <pagination
+                v-show="total > 0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getMerchantList"
+            />
     </div>
 
 </template>
@@ -92,7 +93,6 @@ export default {
             buttonBoolean: false,
             //图标，可根据自己的需求匹配
             icon: "el-icon-caret-bottom",
-
             total: 0,
             queryParams: {
                 pageNum: 1,
@@ -101,7 +101,7 @@ export default {
         };
     },
     created() {
-        this.getFinancialMerchantList();
+        this.getMerchantList();
     },
     methods: {
         showOrHide() {
@@ -116,7 +116,7 @@ export default {
             }
         },
         // 获取运营商列表
-        getFinancialMerchantList() {
+        getMerchantList() {
             getFinancialMerchantList(this.queryParams).then((response) => {
                 this.merchantList = response.rows;
                 this.total = response.total;
@@ -140,16 +140,6 @@ export default {
             this.resetForm("queryForm");
             // this.handleQuery();
         },
-        /** 导出按钮操作 */
-        handleExport() {
-            // this.download(
-            //     "order/order/export",
-            //     {
-            //         ...this.queryParams,
-            //     },
-            //     `order_${new Date().getTime()}.xlsx`
-            // );
-        },
     },
 };
 </script>