更换支付

src/views/dashboard/Brief.vue

@@ -15,7 +15,7 @@
           </div>
         </div>
         <div class="card-panel-icon-wrapper">
-          <small-line-chart class-name="panel-chart" :data="totalDeviceChartData" name="设备数量" color="#165DFF" type="bar" y-axis-min="0"/>
+          <small-line-chart class-name="panel-chart" :data="totalDeviceChartData" name="设备数量" color="#165DFF" />
         </div>
       </div>
     </el-col>
@@ -74,7 +74,7 @@
           </div>
         </div>
         <div class="card-panel-icon-wrapper">
-          <small-line-chart class-name="panel-chart" :data="deviceChartData" name="设备数量" color="#165DFF" type="bar" y-axis-min="0"/>
+          <small-line-chart class-name="panel-chart" :data="deviceChartData" name="设备数量" color="#165DFF"/>
         </div>
       </div>
     </el-col>

src/views/dashboard/DailyHourBillChart.vue

@@ -30,6 +30,9 @@ export default {
       billData: []
     }
   },
+  created() {
+    this.getBillList();
+  },
   methods: {
     // 获取分时记录统计
     getBillList() {

src/views/ss/payBill/index.vue

@@ -1,4 +1,4 @@
-<template>
+`<template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="支付编号" prop="payNo">

src/views/system/recharge/detail.vue

@@ -93,7 +93,7 @@ import { SuitFeeType, views } from '@/utils/constants'
 import PayBill from '@/views/ss/payBill/index.vue'
 
 export default {
-  name: 'RechargeDetail',
+  name: 'Recharge/:billId',
   components: { PayBill, UserLink, DeviceLink, Refund },
   dicts: ['channel_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'time_unit', 'suit_fee_mode', 'suit_fee_type'],
   computed: {

src/views/system/recharge/index.vue

@@ -41,16 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="交易状态" prop="status">
-        <el-select v-model="queryParams.status" clearable placeholder="请选择交易状态" @change="handleQuery">
-          <el-option
-            v-for="dict in dict.type.sm_transaction_bill_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="设备充值状态" prop="deviceRechargeStatus" label-width="7em">
         <el-select v-model="queryParams.deviceRechargeStatus" clearable placeholder="请选择设备充值状态" @change="handleQuery">
           <el-option
@@ -71,6 +61,33 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="收费模式" prop="suitFeeMode">
+        <el-select v-model="queryParams.suitFeeMode" clearable placeholder="请选择收费模式" @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.suit_fee_mode"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="收费方式" prop="suitFeeType">
+        <el-select v-model="queryParams.suitFeeType" clearable placeholder="请选择收费方式" @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.suit_fee_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="交易状态" prop="statusList">
+        <el-checkbox-group v-model="queryParams.statusList" @change="handleQuery" size="mini">
+          <el-checkbox-button v-for="dict in dict.type.sm_transaction_bill_status" :label="dict.value" :key="dict.value">
+            {{dict.label}}
+          </el-checkbox-button>
+        </el-checkbox-group>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -244,7 +261,7 @@ const defaultSort = {
 }
 
 export default {
-  name: "Bill",
+  name: "Recharge",
   mixins: [$showColumns],
   components: { RechargeLink, DeviceLink, UserLink },
   dicts: ['channel_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'suit_fee_mode', 'suit_fee_type'],
@@ -298,6 +315,7 @@ export default {
         deviceName: null,
         landlordName: null,
         type: "1",  // 充值
+        statusList: ['1','2','3','6','7','8','9'],
       },
       // 表单参数
       form: {},