From d96e80eccf50e7bdf889a4748099772c77a1a866 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Sat, 8 Jul 2023 10:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/components/virtualFinance.vue   | 10 +++---
 jsowell-ui/src/views/financial/merchant.vue   | 34 +++++++------------
 .../pile/merchant/components/adapayMember.vue |  2 +-
 .../merchant/components/walletSummary.vue     |  4 +--
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/jsowell-ui/src/views/financial/components/virtualFinance.vue b/jsowell-ui/src/views/financial/components/virtualFinance.vue
index 17b86c926..6b99d8cf3 100644
--- a/jsowell-ui/src/views/financial/components/virtualFinance.vue
+++ b/jsowell-ui/src/views/financial/components/virtualFinance.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <!-- <el-row :gutter="10">
+    <el-row :gutter="10">
         <el-col :span="24">
     <div class="public">
       <div class="bgc headTitle">虚拟充值用户充电收入</div>
@@ -9,14 +9,14 @@
           <div> <i class="el-icon-user" style="font-size:30px"></i></div>
           <div class="content-title">
             <span>运营商:</span>
-            <span style="margin-left: 80px;font-size: 15px;">贵州省怀仁市新能源科技有限公司</span>
+            <span style="margin-left: 80px;font-size: 15px;">{{$route.query.merchantName}}</span>
           </div>
         </div>
       </div>
     </div>
   </el-col>
        
-        <el-col :span="12">
+        <!-- <el-col :span="12">
     <div class="public">
       <div class="bgc1 headTitle">充电收入汇总</div>
        <div class="headBox">
@@ -28,8 +28,8 @@
          </div>
       </div>
     </div>
-        </el-col>
-    </el-row> -->
+        </el-col> -->
+    </el-row>
    <div class="search">
       <el-form :inline="true" :model="queryParams" class="demo-form-inline">
          <el-form-item label="日期" prop="tradeDate">
diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index 069d11410..7e4b751d1 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/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>
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 2df2aa8fa..2188d88eb 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -186,7 +186,7 @@
             <el-button  type="primary" v-if="adapayCorpMember.auditState != 'E'" @click="dialog=true">新建</el-button>
             </div>
             </div>
-            <div v-if="adapayCorpMember.auditState != 'E'">
+            <div v-if="adapayCorpMember.auditState == 'E'">
                 <el-form :model="adapayCorpMember" class="adapayStyle" label-position="left" label-width="200px">
                     <el-form-item label="企业名称：">
                         <div class="color">{{adapayCorpMember.name}}</div>
diff --git a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
index d564f73be..104809f94 100644
--- a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
@@ -162,7 +162,7 @@ export default {
             done();
           })
           .catch(_ => {});
-      },
+        },
         handleClick(tab, event) {
             console.log(tab, event);
         },
@@ -177,7 +177,7 @@ export default {
                 this.buttonBoolean = !this.buttonBoolean;
             }
         },
-          getList() {
+        getList() {
             console.log("this.merchantId", this.merchantId);
             let param = {
                 merchantId: this.merchantId,