Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/financial/components/virtualFinance.vue

@@ -15,7 +15,7 @@
       </div>
     </div>
   </el-col>
-       
+
         <!-- <el-col :span="12">
     <div class="public">
       <div class="bgc1 headTitle">充电收入汇总</div>
@@ -63,8 +63,15 @@
                 <el-table-column
                     prop="orderCode"
                     label="订单号"
-                    align="center"
-                />
+                    align="center">
+                    <template slot-scope="scope">
+                        <router-link
+                            :to="'/order/index/orderDetail/' +scope.row.orderCode"
+                            class="link-type">
+                            {{ scope.row.orderCode }}
+                        </router-link>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     prop="transactionCode"
                     label="交易流水号"
@@ -76,7 +83,11 @@
                     label="站点名称"
                     align="center"
                     width="130"
-                />
+                >
+                    <template slot-scope="scope">
+                        <span class="link-type" @click="goStationDetail(scope)">{{ scope.row.stationName }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     prop="orderAmount"
                     label="订单金额"
@@ -128,6 +139,17 @@ export default {
       }
     },
     methods: {
+        goStationDetail(scope) {
+            // console.log(scope,'跳转站点名称')
+            // console.log("跳转到充电站详情", scope.row.stationName);
+            this.$router.push({
+                name: 'stationDetail',
+                params: {
+                    id: scope.row.stationId,
+                    stationName: scope.row.stationName,
+                }
+            });
+        },
        defaultDate() {
             let beg = getDay(-30); //当月第一天
             let end = getDay(0); //当天

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -56,10 +56,9 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="交易日期" align="center" prop="tradeDate" />
             <el-table-column label="站点名称" align="center" prop="stationName" >
-<!--                <template slot-scope="scope">-->
-
-<!--                    <span class="link-type" @click="goStationOrderReport(scope)">{{ scope.row.stationName }}</span>-->
-<!--                </template>-->
+                <template slot-scope="scope">
+                    <span class="link-type" @click="goStationOrder(scope)">{{ scope.row.stationName }}</span>
+                </template>
             </el-table-column>
 
             <el-table-column
@@ -153,12 +152,11 @@ export default {
                 }
             );
         },
-        goStationOrderReport(scope) {
+        goStationOrder(scope) {
             this.$router.push({
-                path: 'station/orderReport',
-                name: 'Report',
+                name: 'stationDetail',
                 params: {
-                    id: scope.row.id,
+                    id: scope.row.stationId,
                     stationName: scope.row.stationName,
                 }
             });