页面修改

src/components/statistics/salesStatistics.vue

@@ -8,30 +8,27 @@
     </div>
     <div class="content">
       <div style="display: flex;flex-direction: row;align-items: center">
-        <el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.PlatformType" size="small"
-          placeholder="请选择">
-          <el-option v-for="item in options" :key="item.Id" :label="item.Name" :value="item.Id">
+        <el-select class="w100" @change="querychange" style="margin-right: 10px;" v-model="msg.PlatformType"
+          size="small" placeholder="请选择">
+          <el-option v-for="(item,index) in options" :key="index" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
-        <el-select class="w100" @change="getList" style="margin-right: 10px;" size="small" v-model="msg.OrderType"
+        <el-select class="w100" @change="querychange" style="margin-right: 10px;" size="small" v-model="msg.OrderType"
           placeholder="请选择">
-          <el-option v-for="item in options2" :key="item.Id" :label="item.Name" :value="item.Id">
+          <el-option v-for="(item,index) in options2" :key="index" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
         <div class="block">
-          <el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
+          <el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="DateValue" type="daterange"
             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
-            @change="change" align="right">
+            @change="querychange" align="right">
           </el-date-picker>
         </div>
         <el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 20px">
           <el-tab-pane label="7日" name="first"></el-tab-pane>
           <el-tab-pane label="30日" name="second"></el-tab-pane>
-
         </el-tabs>
-
         <span style="color: #92959B;margin-left: 35px;cursor: pointer;font-size: 15px;" @click="empty">清空筛选</span>
-
       </div>
     </div>
     <div class="table-area">
@@ -94,7 +91,7 @@
         </div>
       </div>
     </div>
-    <div class="table-area">
+    <div class="table-area" style="display:none;">
       <div class="el-card is-never-shadow">
         <div class="el-card__header">
           <div>
@@ -156,7 +153,7 @@
     </div>
     <div style="padding: 20px;background: #fff;margin-top: 10px">
       <el-tabs v-model="msg.OrderStatus" @tab-click="handleClick2">
-        <el-tab-pane v-for="(item,index) of tabsList" :key=index :label="item.Name" :name="item.ID"></el-tab-pane>
+        <el-tab-pane v-for="(item,index) of tabsList" :key="index" :label="item.Name" :name="item.ID"></el-tab-pane>
       </el-tabs>
       <el-table v-loading="Listloading" :data="tableData" header-cell-class-name="headClass" style="width: 100%;">
         <el-table-column prop="CreateDate" label="日期" min-width="2">
@@ -171,6 +168,14 @@
         </el-table-column>
         <el-table-column prop="RepurchaseNum" v-if="msg.OrderStatus!=4&&msg.OrderStatus!=5" label="复购人数" min-width="2">
         </el-table-column>
+        <el-table-column prop="LoginEmpActive" v-if="msg.OrderStatus==0" label="内部员工活跃人数" min-width="2">
+        </el-table-column>
+        <el-table-column prop="LoginLeaderActive" v-if="msg.OrderStatus==0" label="领队导游活跃人数" min-width="2">
+        </el-table-column>
+        <el-table-column prop="OrderEmpActive" v-if="msg.OrderStatus==0" label="内部员工下单人数" min-width="2">
+        </el-table-column>
+        <el-table-column prop="OrderLeaderActice" v-if="msg.OrderStatus==0" label="领队导游下单人数" min-width="2">
+        </el-table-column>
       </el-table>
       <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
         :current-page.sync="msg.pageIndex" layout="prev, pager, next" :total="count">
@@ -224,7 +229,7 @@
         Coupon: 0,
         tableData: [],
         count: 0,
-        value: '',
+        DateValue: '',
         activeName: '',
         loading: false,
         Totaldata: {
@@ -244,21 +249,11 @@
       }
     },
     created() {
-      this.getUserStatics();
       this.getplat();
       this.getOrderTypeEnumEnumList()
-      this.getIntegraStatisticslList()
+      this.querychange()
     },
     methods: {
-      //获取登录和订单用户统计1
-      getUserStatics() {
-        this.apipost("/api/Statistics/GetDataStatistics", {}, res => {
-          if (res.data.resultCode == 1) {
-            this.loginData = res.data.data.loginObj;
-            this.orderData = res.data.data.orderObj
-          }
-        })
-      },
       getplat() {
         this.apipost("/api/User/GetMemberUserSourceEnumList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -279,22 +274,43 @@
               Id: 0
             })
           }
-
         })
       },
-      change(val) {
+      //7日和30日切换
+      handleClick(tab, event) {
+        if (tab.name == 'first') {
+          this.fun_date(7)
+        } else if (tab.name == 'second') {
+          this.fun_date(30)
+        }
+        this.querychange(tab.name);
+      },
+      //查询添加改变
+      querychange(name) {
+        if (name && name != '') {
+          this.activeName = name
+        } else {
           this.activeName = ''
+        }
         this.msg.pageIndex = 1
-        this.getIntegraStatisticslList(false)
-      },
-      getDataList(show = false) {
-        if (this.value != '' && this.value != null) {
-          this.msg.StartDate = this.value[0];
-          this.msg.EndDate = this.value[1];
+        if (this.DateValue != '' && this.DateValue != null) {
+          this.msg.StartDate = this.DateValue[0];
+          this.msg.EndDate = this.DateValue[1];
         } else {
           this.msg.StartDate = '';
           this.msg.EndDate = '';
         }
+        this.getIntegraStatisticslList();
+        this.getTodayStatics();
+        this.getDataList(true)
+      },
+      //订单列表统计分页切换
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getDataList();
+      },
+      //获取订单分页列表
+      getDataList(show = false) {
         if (show == true) {
           this.Listloading = true;
         }
@@ -308,9 +324,9 @@
           }
         })
       },
-      getIntegraStatisticslList(show = true) {
+      //获取订单统计
+      getIntegraStatisticslList() {
         this.loading = true;
-        this.getDataList()
         let Totalmsg = {
           PlatformType: this.msg.PlatformType,
           StartDate: this.msg.StartDate,
@@ -325,7 +341,9 @@
             this.Info(res.data.message);
           }
         })
-        if (show == true) {
+      },
+      //获取今日实时成交
+      getTodayStatics() {
         let Totalmsg2 = {
           PlatformType: this.msg.PlatformType,
           StartDate: this.msg.StartDate,
@@ -343,13 +361,7 @@
           } else {
             this.Info(res.data.message);
           }
-
         })
-        }
-      },
-      handleCurrentChange(val) {
-        this.msg.pageIndex = val;
-        this.getDataList()
       },
       Export() {
         let msg = {
@@ -371,22 +383,16 @@
         this.msg.StartDate = '';
         this.msg.EndDate = '';
         this.msg.pageIndex = 1
-        this.value = '';
+        this.DateValue = '';
         this.activeName = '';
-        this.getIntegraStatisticslList()
-      },
-      handleClick(tab, event) {
-
-        if (tab.name == 'first') {
-          this.fun_date(7)
-        } else if (tab.name == 'second') {
-          this.fun_date(30)
-        }
+        this.querychange();
       },
+      //订单状态切换
       handleClick2() {
-        this.msg.pageIndex = 1
+        this.msg.pageIndex = 1;
         this.getDataList(true)
       },
+      //计算日期
       fun_date(num) {
         let that = this
         let date1 = new Date();
@@ -399,15 +405,8 @@
         let data = []
         data.push(time2)
         data.push(time1)
-        that.value = data;
-        this.msg.pageIndex = 1
-        this.getIntegraStatisticslList(false)
-
+        that.DateValue = data;
       },
-      getList() {
-        this.msg.pageIndex = 1
-        this.getIntegraStatisticslList()
-      }
     },
     mounted() {