更新

src/views/dashboard/Brief.vue

@@ -8,10 +8,9 @@
           </div>
           <count-to :start-val="0" :end-val="briefData.deviceCount" :duration="2600" class="card-panel-num" />
           <div class="card-panel-compare">
-            在线
+            <div>
-            <span class="up">
+              在线 <span class="up">{{briefData.onlineCount}} 台</span>
-              {{briefData.onlineCount}} 台
+            </div>
-            </span>
           </div>
         </div>
         <div class="card-panel-icon-wrapper">
@@ -27,11 +26,12 @@
           </div>
           <count-to :start-val="0" :end-val="briefData.rechargeCount" :duration="2600" class="card-panel-num" />
           <div class="card-panel-compare">
-            今日
+            <div>
-            <span class="up">
+              今日<span class="up"> {{briefData.todayRechargeCount}} <svg-icon icon-class="up" /></span>
-              {{briefData.todayRechargeCount}}
+            </div>
-              <svg-icon icon-class="up" />
+            <div>
-            </span>
+              今日<span class="up"> {{briefData.todayRechargeCount}} <svg-icon icon-class="up" /></span>
+            </div>
           </div>
         </div>
         <div class="card-panel-icon-wrapper">

src/views/ss/recordBalance/index.vue

@@ -90,7 +90,10 @@
         </template>
       </el-table-column>
       <el-table-column label="主体类型" align="center" prop="subjectType" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('subjectType')">
-        <dict-tag slot-scope="d" :value="d.row.subjectType" :options="dict.type.record_balance_subject_type"/>
+        <template slot-scope="d">
+          <dict-tag v-if="d.row.subjectType === RecordBalanceSubjectType.USER" :value="d.row.userType" :options="dict.type.user_type"/>
+          <dict-tag v-else :value="d.row.subjectType" :options="dict.type.record_balance_subject_type"/>
+        </template>
       </el-table-column>
       <el-table-column label="业务类型" align="center" prop="bstType" sortable="custom" :sort-orders="orderSorts"  v-if="isShow('bstType')">
         <template slot-scope="d">
@@ -181,7 +184,7 @@ const defaultSort = {
 export default {
   name: "RecordBalance",
   mixins: [$showColumns, $view],
-  dicts: ['record_balance_bst_type', 'record_balance_subject_type'],
+  dicts: ['record_balance_bst_type', 'record_balance_subject_type', 'user_type'],
   computed: {
     RecordBalanceSubjectType() {
       return RecordBalanceSubjectType

src/views/system/device/detail.vue

@@ -128,6 +128,9 @@
 
       <el-card class="box-card">
         <el-tabs>
+          <el-tab-pane label="套餐列表" :lazy="true" v-if="checkPermi(['ss:suit:list'])">
+            <suit v-if="deviceData.storeId != null" :query="{storeId: deviceData.storeId}" :view="views.device"/>
+          </el-tab-pane>
           <el-tab-pane label="订单列表" :lazy="true" v-if="checkPermi(['system:bill:list'])">
             <recharge v-if="deviceData.deviceId != null" :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
           </el-tab-pane>

src/views/system/recharge/index.vue

@@ -41,15 +41,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="交易状态" prop="status">
+      <el-form-item label="交易状态" prop="statusList">
-        <el-select v-model="queryParams.status" clearable placeholder="请选择交易状态" @change="handleQuery">
+        <el-checkbox-group v-model="queryParams.statusList" @change="handleQuery" size="mini">
-          <el-option
+          <el-checkbox-button v-for="dict in dict.type.sm_transaction_bill_status" :label="dict.value" :key="dict.value">
-            v-for="dict in dict.type.sm_transaction_bill_status"
+            {{dict.label}}
-            :key="dict.value"
+          </el-checkbox-button>
-            :label="dict.label"
+        </el-checkbox-group>
-            :value="dict.value"
-          />
-        </el-select>
       </el-form-item>
 <!--      <el-form-item label="支付方式" prop="channelId">-->
 <!--        <el-select v-model="queryParams.channelId" clearable placeholder="请选择支付方式" @change="handleQuery">-->
@@ -278,6 +275,7 @@ export default {
         deviceName: null,
         landlordName: null,
         type: "1",  // 充值
+        statusList: ['1','2','3','6','7','8','9'],
       },
       // 表单参数
       form: {},