修改店铺报表

src/views/dashboard/DailyBillAmountChart.vue

@@ -1,14 +1,11 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <el-row style="margin-bottom: 16px">
       <date-range-picker
         :start-date.sync="queryParams.dateStart"
         :end-date.sync="queryParams.dateEnd"
         @change="getList"
       />
-      <!-- <el-select v-model="queryParams.channelId" @change="getList" placeholder="请选择渠道">
-        <el-option v-for="dict of dict.type.channel_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-      </el-select> -->
       <channel-select v-model="queryParams.channelId" @change="getList"/>
     </el-row>
     <daily-bill-amount-report :bill-data="billData" width="100%" height="250px"/>
@@ -26,6 +23,14 @@ export default {
   name: 'DailyBillAmountChart',
   dicts: ['channel_type'],
   components: { DailyBillAmountReport, DateRangePicker, ChannelSelect },
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
   data() {
     return {
       // 查询条件
@@ -34,10 +39,16 @@ export default {
         dateEnd: getLastDateStr(0),
         channelId: null,
       },
-      billData: []
+      billData: [],
+      loading: false
     }
   },
   created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
+
     this.getList();
   },
   methods: {

src/views/ss/store/components/storeRechargeReport.vue

@@ -33,7 +33,7 @@ export default {
       queryParams: {
         type: 1,
         year: new Date().getFullYear(),
-        status: "2",
+        statusList: ['2', '3', '7'],
         groupBy: "create_month",
         storeId: this.storeId,
       },

src/views/ss/store/detail.vue

@@ -81,15 +81,19 @@
             ></el-statistic>
           </el-row>
         </el-card>
-        <el-card class="box-card">
+        <el-card class="box-card" v-if="store.storeId != null">
-          <store-recharge-report :store-id="store.storeId"/>
+          <el-tabs>
+            <el-tab-pane label="日报表" lazy>
+              <daily-bill-amount-chart  :query="{storeId: store.storeId}"/>
+            </el-tab-pane>
+          </el-tabs>
         </el-card>
       </el-col>
       <el-col :span="6">
         <el-card class="box-card">
           <place-search-map
             v-if="showMap"
-            height="534px"
+            height="455px"
             :init-lng="store.lng"
             :init-lat="store.lat"
             enable-geo
@@ -135,9 +139,11 @@ import { isEmpty } from '@/utils'
 import deviceData from 'svg-sprite-loader/examples/custom-runtime-generator/build/main'
 import BooleanTag from '@/components/BooleanTag/index.vue'
 import StoreStaff from '@/views/ss/storeStaff/index.vue'
+import DailyBillAmountChart from '@/views/dashboard/DailyBillAmountChart.vue'
 
 export default {
   name: 'storeDetail',
+  components: { StoreStaff, BooleanTag, Recharge, Device, StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap, DailyBillAmountChart },
   computed: {
     deviceData() {
       return deviceData
@@ -146,7 +152,6 @@ export default {
       return views
     }
   },
-  components: { StoreStaff, BooleanTag, Recharge, Device, StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap },
   dicts: ['ss_store_type', 'store_status'],
   data() {
     return {