统计修改

src/components/rank/dataCount.vue

@@ -909,7 +909,6 @@ export default {
           query = {
             activation: 1,
             blank: "y",
-            
           }
         }else if(type==4){
           query = {
@@ -918,10 +917,7 @@ export default {
             blank: "y",
           }
         }
-        this.$router.push({
-          name: 'customerTransfer',
-          query
-        });
+        this.OpenNewPage('/customerTransfer',query)
       }
       if(type>4&&type<9){
         if(type==5){
@@ -963,10 +959,7 @@ export default {
             blank: "y",
           }
         }
-        this.$router.push({
-          name: 'enrollTotal',
-          query
-        });
+        this.OpenNewPage('/salesVolumeRank',query)
       }
     },
     changeDepart(node, instanceId){

src/components/rank/salesVolumeRank.vue

@@ -3,13 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="$t('sm.Personalrank')" name="first"></el-tab-pane>
       <el-tab-pane :label="$t('sm.derprank')" name="second"></el-tab-pane>
-      <!--
-        v-if="authority.indexOf('Sales_Volume_Rank_Show') != -1" -->
-      <el-tab-pane
-        :label="$t('sm.companyrank')"
-        name="third"
-        v-if="S_CheckAllOrder"
-      ></el-tab-pane>
+      <el-tab-pane :label="$t('sm.companyrank')" name="third" v-if="S_CheckAllOrder"></el-tab-pane>
       <el-tab-pane :label="$t('sm.salerank')" name="four"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
@@ -17,88 +11,42 @@
         <el-row style="padding: 15px 0px 0 0">
           <el-col :span="4" v-show="activeName != 'four'">
             <el-form-item :label="$t('system.table_company')">
-              <el-select
-                filterable
-                v-model="msg.RB_Branch_Id"
-                @change="getDepartment"
-                class
-              >
-                <el-option
-                  :value="-1"
-                  :label="$t('pub.unlimitedSel')"
-                ></el-option>
-                <el-option
-                  v-for="item in CompanyList"
-                  :label="item.BName"
-                  :value="item.Id"
-                  :key="item.Id"
-                ></el-option>
+              <el-select filterable v-model="msg.RB_Branch_Id" @change="getDepartment" class>
+                <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            :span="4"
-            v-show="activeName != 'third' && activeName != 'four'"
-          >
+          <el-col :span="4" v-show="activeName != 'third' && activeName != 'four'">
             <el-form-item :label="$t('admin.admin_Department')">
-              <el-select
-                filterable
-                v-model="msg.RB_Department_Id"
-                @change="getEmployee"
-                class
-              >
-                <el-option
-                  :value="0"
-                  :label="$t('pub.unlimitedSel')"
-                ></el-option>
-                <el-option
-                  v-for="item in DepartmentList"
-                  :label="item.DepartmentName"
-                  :value="item.DepartmentID"
-                  :key="item.DepartmentID"
-                ></el-option>
+              <el-select filterable v-model="msg.RB_Department_Id" @change="getEmployee" class>
+                <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option v-for="item in DepartmentList" :label="item.DepartmentName" :value="item.DepartmentID"
+                  :key="item.DepartmentID"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4" v-show="activeName == 'first'">
             <el-form-item :label="$t('salesModule.Personnel')">
               <el-select filterable v-model="msg.EnterID" class>
-                <el-option
-                  :value="0"
-                  :label="$t('pub.unlimitedSel')"
-                ></el-option>
-                <el-option
-                  v-for="item in EmployeeList"
-                  :label="item.EmName"
-                  :value="item.EmployeeId"
-                  :key="item.EmployeeId"
-                ></el-option>
+                <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                  :key="item.EmployeeId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="$t('sm.chutuandate')">
-              <el-date-picker
-                v-model="msg.tStartDates"
-                type="daterange"
-                range-separator="-"
-                :start-placeholder="$t('hotel.hotel_StartDate')"
-                :end-placeholder="$t('hotel.hotel_EndDate')"
-                value-format="yyyy-MM-dd"
-                :picker-options="pickerOptions"
-              ></el-date-picker>
+            <el-form-item :label="$t('fnc.bmriqi')">
+              <el-date-picker v-model="msg.qStartDates" type="daterange" range-separator="-"
+                :start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="$t('fnc.bmriqi')">
-              <el-date-picker
-                v-model="msg.qStartDates"
-                type="daterange"
-                range-separator="-"
-                :start-placeholder="$t('hotel.hotel_StartDate')"
-                :end-placeholder="$t('hotel.hotel_EndDate')"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
+            <el-form-item :label="$t('sm.chutuandate')">
+              <el-date-picker v-model="msg.tStartDates" type="daterange" range-separator="-"
+                :start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
+                value-format="yyyy-MM-dd" :picker-options="pickerOptions"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -111,370 +59,362 @@
         </li>
       </ul>
     </div>
-    <el-table
-    v-if="isReady"
-    ref="singleTable"
-    :data="tableData"
-    style="width: 100%">
-    <el-table-column
-      type="index"
-      :label="$t('active.ad_xuhao')"
-      :width="getLanguage()=='en-US'?'120':'50'"
-      >
-    </el-table-column>
-    <el-table-column
-      property="name"
-      :label="$t('system.query_airName')">
-    </el-table-column>
-    <el-table-column
-      property="SumPreferPrice"
-      :label="$t('objFill.xiaosoue')"
-      width="" sortable>
-      <template slot-scope="scope">
-        <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.SumPreferPrice}}</div>
-      </template>
-    </el-table-column>
-    <el-table-column
-      property="income"
-      :label="$t('fnc.skjine')"
-      width="" sortable>
-      <template slot-scope="scope">
-        <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.income}}</div>
-      </template>
-    </el-table-column>
-    <el-table-column
-      property="notInCome"
-      :label="$t('fnc.wsjine')"
-      width="" sortable>
-      <template slot-scope="scope">
-        <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.notInCome}}</div>
-      </template>
-    </el-table-column>
-    <el-table-column
-      property="peopleCount"
-      :label="$t('objFill.v101.SalesModule.zhengchangsks')"
-      width="" sortable>
-    </el-table-column>
-    <el-table-column
-      property="CalcheCount"
-      :label="$t('objFill.v101.SalesModule.quxiaosks')"
-      width="" sortable>
-    </el-table-column>
-    <el-table-column
-      property="totalGuestNum"
-      :label="$t('objFill.v101.SalesModule.danxiansks')"
-      width="">
-    </el-table-column>
-    <el-table-column
-      property="avgPrice"
-      :label="$t('objFill.v101.SalesModule.kedanjia')"
-      width="" sortable>
-    </el-table-column>
-    <el-table-column
-      property="XiaoBaoTuanCount"
-      :label="$t('objFill.v101.SalesModule.xiaobaotts')"
-      width="">
-    </el-table-column>
-    <el-table-column
-      property="zanBi"
-      :label="$t('objFill.v101.SalesModule.xiaosouezb')"
-      width="">
-    </el-table-column>
-  </el-table>
+    <el-table v-if="isReady" ref="singleTable" :data="tableData" style="width: 100%" v-loading="loading">
+      <el-table-column type="index" :label="$t('active.ad_xuhao')" :width="getLanguage()=='en-US'?'120':'50'">
+      </el-table-column>
+      <el-table-column property="name" :label="$t('system.query_airName')">
+      </el-table-column>
+      <el-table-column property="SumPreferPrice" :label="$t('objFill.xiaosoue')" width="" sortable>
+        <template slot-scope="scope">
+          <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.SumPreferPrice}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column property="income" :label="$t('fnc.skjine')" width="" sortable>
+        <template slot-scope="scope">
+          <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.income}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column property="notInCome" :label="$t('fnc.wsjine')" width="" sortable>
+        <template slot-scope="scope">
+          <div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.notInCome}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column property="peopleCount" :label="$t('objFill.v101.SalesModule.zhengchangsks')" width="" sortable>
+      </el-table-column>
+      <el-table-column property="CalcheCount" :label="$t('objFill.v101.SalesModule.quxiaosks')" width="" sortable>
+      </el-table-column>
+      <el-table-column property="totalGuestNum" :label="$t('objFill.v101.SalesModule.danxiansks')" width="">
+      </el-table-column>
+      <el-table-column property="avgPrice" :label="$t('objFill.v101.SalesModule.kedanjia')" width="" sortable>
+      </el-table-column>
+      <el-table-column property="XiaoBaoTuanCount" :label="$t('objFill.v101.SalesModule.xiaobaotts')" width="">
+      </el-table-column>
+      <el-table-column property="zanBi" :label="$t('objFill.v101.SalesModule.xiaosouezb')" width="">
+      </el-table-column>
+      <el-table-column property="CustomerCount" label="客户总数" width="">
+      </el-table-column>
+      <el-table-column property="TodayAddCustomer" label="今日新增" width="">
+      </el-table-column>
+      <el-table-column property="MiniAppCount" label="小程序激活数" width="">
+      </el-table-column>
+      <el-table-column property="MiniAppAdd" label="今日激活数" width="">
+      </el-table-column>
+      <el-table-column property="OrderCount" label="团队订单数" width="">
+      </el-table-column>
+      <el-table-column property="CouponCount" label="优惠卷订单数" width="">
+      </el-table-column>
+      <el-table-column property="LXYCount" label="小程序订单数" width="">
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 <script>
-import Vue from "vue";
-import moment from 'moment'
-export default {
-  data() {
-    return {
-      S_CheckAllOrder: false,
-      pickerOptions: {
-        disabledDate(time) {
-          return time < new Date("2018-12-31");
+  import Vue from "vue";
+  import moment from 'moment'
+  export default {
+    data() {
+      return {
+        S_CheckAllOrder: false,
+        pickerOptions: {
+          disabledDate(time) {
+            return time < new Date("2018-12-31");
+          },
         },
+        activeName: "first",
+        columns: [],
+        pageSize: 100000,
+        pageIndex: 1,
+        total: 0,
+        tableData: [],
+        isReady: false,
+        multipleSort: false,
+        loading: true,
+        authority: [],
+        msg: {
+          RB_Branch_Id: -1,
+          RB_Department_Id: 0,
+          EnterID: 0,
+          tStartDates: [], //出发日期
+          qStartDates: [], //报名日期
+          GroupBy: "EnterID",
+          QueryType: 0,
+        },
+        getCompanyMsg: {
+          // 公司
+          RB_Group_Id: "0",
+          Status: "0",
+        },
+        getDepartmentMsg: {
+          // 部门
+          RB_Group_Id: "",
+          RB_Branch_Id: "",
+          Status: 0,
+          ParentId: -1,
+          Tier: 0,
+        },
+        employeeMsg: {
+          // 员工
+          GroupId: "",
+          BranchId: -1,
+          DepartmentId: 0,
+          PostId: 0,
+          IsLeave: 0,
+        },
+        CompanyList: [],
+        DepartmentList: [],
+        EmployeeList: [],
+      };
+    },
+    created() {
+      this.getCompanyList();
+      this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
+      this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
+      this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
+      if (this.$route.query.CStartDate && this.$route.query.CEndDate) {
+        this.msg.qStartDates.push(this.$route.query.CStartDate.replace(/\//g, '-'));
+        this.msg.qStartDates.push(this.$route.query.CEndDate.replace(/\//g, '-'));
+      } else {
+        this.settStartDates();
+      }
+      if (this.$route.query.BranchId) {
+        this.msg.RB_Branch_Id = Number(this.$route.query.BranchId);
+        this.getDepartmentMsg.RB_Branch_Id = Number(this.$route.query.BranchId);
+        this.employeeMsg.RB_Branch_Id = Number(this.$route.query.BranchId);
+        this.getDepartment();
+      }
+      if (this.$route.query.RB_Department_Id) {
+        this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
+        this.employeeMsg.DepartmentId = Number(this.$route.query.RB_Department_Id);
+        this.getEmployee();
+      }
+      if (this.$route.query.EmployeeId) {
+        this.msg.EnterID = Number(this.$route.query.EmployeeId);
+      }
+    },
+    mounted() {
+      this.GetAuth()
+      this.initColumns();
+      this.initData();
+      this.initAuthor();
+    },
+    methods: {
+      goUrl(name, rowData) {
+        if (name == 'salesVolumeRankEntryForm') this.customCompFunc(rowData)
       },
-      activeName: "first",
-      columns: [],
-      pageSize: 100000,
-      pageIndex: 1,
-      total: 0,
-      tableData: [],
-      isReady: false,
-      multipleSort: false,
-      loading: true,
-      authority: [],
-      msg: {
-        RB_Branch_Id: -1,
-        RB_Department_Id: 0,
-        EnterID: 0,
-        tStartDates: [],
-        qStartDates: [],
-        GroupBy: "EnterID",
-        QueryType: 0,
-      },
-      getCompanyMsg: {
-        // 公司
-        RB_Group_Id: "0",
-        Status: "0",
+      customCompFunc(rowData) {
+        this.$router.push({
+          path: "/salesVolumeRankEntryForm",
+          query: {
+            BranchId: rowData.BranchId,
+            EnterID: rowData.EnterID,
+            RB_Department_Id: rowData.RB_Department_Id,
+            blank: "y",
+            tStartDates: this.msg.tStartDates,
+            qStartDates: this.msg.qStartDates,
+          },
+        });
       },
-      getDepartmentMsg: {
-        // 部门
-        RB_Group_Id: "",
-        RB_Branch_Id: "",
-        Status: 0,
-        ParentId: -1,
-        Tier: 0,
+      GetAuth() {
+        var actionCode = this.$AuthCode.S_CheckAllOrder;
+        this.CheckUserAuth(actionCode, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.S_CheckAllOrder = true;
+          }
+        });
       },
-      employeeMsg: {
-        // 员工
-        GroupId: "",
-        BranchId: -1,
-        DepartmentId: 0,
-        PostId: 0,
-        IsLeave: 0,
+      initColumns() {
+        this.isReady = true;
       },
-      CompanyList: [],
-      DepartmentList: [],
-      EmployeeList: [],
-    };
-  },
-  created() {},
-  mounted() {
-    this.settStartDates()
-    this.GetAuth()
-    this.initColumns();
-    this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
-    this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
-    this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
-    this.initData();
-    this.getCompanyList();
-    this.initAuthor();
-    //this.pageSize = this.calcPageSize(40); 此页不需要分页
-  },
-  methods: {
-    goUrl(name,rowData){
-      if(name=='salesVolumeRankEntryForm') this.customCompFunc(rowData)
-    },
-    customCompFunc(rowData) {
-      this.$router.push({
-        path: "/salesVolumeRankEntryForm",
-        query: {
-          BranchId: rowData.BranchId,
-          EnterID: rowData.EnterID,
-          RB_Department_Id: rowData.RB_Department_Id,
-            blank: "y",
-        tStartDates: this.msg.tStartDates,
-        qStartDates: this.msg.qStartDates,
-        },
-      });},
-    GetAuth() {
-      var actionCode = this.$AuthCode.S_CheckAllOrder;
-      this.CheckUserAuth(actionCode, res => {
-        if (res.data.resultCode == 1 && res.data.data == 1) {
-          this.S_CheckAllOrder = true;
+      initData() {
+        this.loading = true;
+        console.log("this.msg", this.msg);
+        let param = {
+          RB_Branch_Id: this.msg.RB_Branch_Id == -1 ? null : this.msg.RB_Branch_Id,
+          RB_Department_Id: this.msg.RB_Department_Id == 0 ? null : this.msg.RB_Department_Id,
+          EnterID: this.msg.EnterID == 0 ? null : this.msg.EnterID,
+          QStartDate: this.msg.tStartDates && this.msg.tStartDates.length == 2 ?
+            this.msg.tStartDates[0] : null,
+          QEndDate: this.msg.tStartDates && this.msg.tStartDates.length == 2 ?
+            this.msg.tStartDates[1] : null,
+          CStartDate: this.msg.qStartDates && this.msg.qStartDates.length == 2 ?
+            this.msg.qStartDates[0] : null,
+          CEndDate: this.msg.qStartDates && this.msg.qStartDates.length == 2 ?
+            this.msg.qStartDates[1] : null,
+          GroupBy: this.msg.GroupBy,
+          QueryType: this.msg.QueryType,
+        };
+        if (!param.QStartDate) {
+          param.QStartDate = "2019-01-01";
         }
-      });
-    },
-    initColumns() {
-      this.isReady = true;
-    },
-    initData() {
-      this.loading = true;
-      let param = {
-        RB_Branch_Id:
-          this.msg.RB_Branch_Id == -1 ? null : this.msg.RB_Branch_Id,
-        RB_Department_Id:
-          this.msg.RB_Department_Id == 0 ? null : this.msg.RB_Department_Id,
-        EnterID: this.msg.EnterID == 0 ? null : this.msg.EnterID,
-        QStartDate:
-          this.msg.tStartDates && this.msg.tStartDates.length == 2
-            ? this.msg.tStartDates[0]
-            : null,
-        QEndDate:
-          this.msg.tStartDates && this.msg.tStartDates.length == 2
-            ? this.msg.tStartDates[1]
-            : null,
-        CStartDate:
-          this.msg.qStartDates && this.msg.qStartDates.length == 2
-            ? this.msg.qStartDates[0]
-            : null,
-        CEndDate:
-          this.msg.qStartDates && this.msg.qStartDates.length == 2
-            ? this.msg.qStartDates[1]
-            : null,
-        GroupBy: this.msg.GroupBy,
-        QueryType: this.msg.QueryType,
-      };
-      if (!param.QStartDate) {
-        param.QStartDate = "2019-01-01";
-      }
-      this.tableData = []
-      this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
-        r.data.data.forEach((x) => {
-          x.incomeVal = parseFloat(x.income);
-          x.avgPrice = parseFloat(x.avgPrice);
-        });
-        this.tableData = r.data.data;
-        this.loading = false;
-      });
-    },
-    getCompanyList() {
-      //获取公司列表
-      this.apipost(
-        "admin_get_BranchGetList",
-        this.getCompanyMsg,
-        (res) => {
-          if (res.data.resultCode == 1) {
-            this.CompanyList = res.data.data;
-          } else {
+        this.tableData = []
+        this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
+          var tempData = r.data.data;
+          if (tempData && tempData.length > 0) {
+            tempData.forEach((x) => {
+              x.incomeVal = parseFloat(x.income);
+              x.avgPrice = parseFloat(x.avgPrice);
+            });
           }
-        },
-        (err) => {}
-      );
-    },
-    initAuthor() {
-      let msg = {
-        MenuUrl: "/salesVolumeRank",
-      };
-      this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, (r) => {
-        this.authority = r.data.data;
-      });
-    },
-    getDepartment() {
-      //部门
-      this.getDepartmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id;
-      this.msg.RB_Department_Id = 0;
-      this.msg.EnterID = 0;
-      this.DepartmentList = [];
-      this.EmployeeList = [];
-      if (this.msg.RB_Branch_Id != -1) {
+          this.tableData = tempData;
+          this.loading = false;
+        });
+      },
+      getCompanyList() {
+        //获取公司列表
         this.apipost(
-          "admin_get_DepartmentGetList",
-          this.getDepartmentMsg,
+          "admin_get_BranchGetList",
+          this.getCompanyMsg,
           (res) => {
             if (res.data.resultCode == 1) {
-              this.DepartmentList = res.data.data;
+              this.CompanyList = res.data.data;
+            } else {}
+          },
+          (err) => {}
+        );
+      },
+      initAuthor() {
+        let msg = {
+          MenuUrl: "/salesVolumeRank",
+        };
+        this.apipost("admin_get_GetActionCodeForUrlAndUser", msg, (r) => {
+          this.authority = r.data.data;
+        });
+      },
+      getDepartment() {
+        //部门
+        this.getDepartmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id;
+        this.msg.RB_Department_Id = 0;
+        this.msg.EnterID = 0;
+        this.DepartmentList = [];
+        this.EmployeeList = [];
+        if (this.msg.RB_Branch_Id != -1) {
+          this.apipost(
+            "admin_get_DepartmentGetList",
+            this.getDepartmentMsg,
+            (res) => {
+              if (res.data.resultCode == 1) {
+                this.DepartmentList = res.data.data;
+              }
+            },
+            (err) => {}
+          );
+        }
+      },
+      getEmployee() {
+        this.employeeMsg.DepartmentId = this.msg.RB_Department_Id;
+        this.msg.EnterID = 0;
+        this.EmployeeList = [];
+        //员工
+        this.apipost(
+          "admin_get_EmployeeGetList",
+          this.employeeMsg,
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data;
             }
           },
           (err) => {}
         );
-      }
-    },
-    getEmployee() {
-      this.employeeMsg.DepartmentId = this.msg.RB_Department_Id;
-      this.msg.EnterID = 0;
-      this.EmployeeList = [];
-      //员工
-      this.apipost(
-        "admin_get_EmployeeGetList",
-        this.employeeMsg,
-        (res) => {
-          if (res.data.resultCode == 1) {
-            this.EmployeeList = res.data.data;
+      },
+      settStartDates() {
+        if (this.$route.query.tStartDates) {
+          this.msg.tStartDates = this.$route.query.tStartDates
+        } else {
+          let date = moment().format('yyyy-MM-DD')
+          let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
+          //this.msg.tStartDates = [start, date]
+          this.msg.qStartDates = [start, date];
+        }
+      },
+      handleClick(tab, event) {
+        this.msg.EnterID = 0;
+        this.msg.QueryType = 0;
+        if (this.activeName == "first") this.msg.GroupBy = "EnterID";
+        else if (this.activeName == "second")
+          this.msg.GroupBy = "RB_Department_Id";
+        else if (this.activeName == "third") {
+          this.msg.GroupBy = "RB_Branch_Id";
+          this.msg.RB_Department_Id = 0;
+        } else {
+          this.msg.RB_Department_Id = 0;
+          this.msg.RB_Branch_Id = -1;
+          this.msg.GroupBy = "EnterID";
+          this.msg.QueryType = 4;
+        }
+        this.initColumns();
+        this.initData();
+      },
+      sortChange(param) {
+        //自己写实现
+        let d = JSON.parse(JSON.stringify(this.tableData));
+        if (d && d.length > 0) {
+          if (param.income != "") {
+            this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
+          } else if (param.peopleCount != "") {
+            this.tableData = this.orderBy(
+              d,
+              ["peopleCount"],
+              param.peopleCount
+            ).results;
+          } else if (param.avgPrice != "") {
+            this.tableData = this.orderBy(
+              d,
+              ["avgPrice"],
+              param.avgPrice
+            ).results;
+          } else if (param.notInCome != "") {
+            this.tableData = this.orderBy(
+              d,
+              ["notInCome"],
+              param.notInCome
+            ).results;
+          } else if (param.PreferPrice != "") {
+            this.tableData = this.orderBy(
+              d,
+              ["PreferPrice"],
+              param.PreferPrice
+            ).results;
+          } else if (param.CalcheCount != "") {
+            this.tableData = this.orderBy(
+              d,
+              ["CalcheCount"],
+              param.CalcheCount
+            ).results;
           }
-        },
-        (err) => {}
-      );
-    },
-    settStartDates() {
-      if(this.$route.query.tStartDates){
-        this.msg.tStartDates = this.$route.query.tStartDates
-      }else{
-        let date = moment().format('yyyy-MM-DD')
-        let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
-        this.msg.tStartDates = [start, date]
-      }
-    },
-    handleClick(tab, event) {
-      this.msg.EnterID = 0;
-      this.msg.QueryType = 0;
-      if (this.activeName == "first") this.msg.GroupBy = "EnterID";
-      else if (this.activeName == "second")
-        this.msg.GroupBy = "RB_Department_Id";
-      else if (this.activeName == "third") {
-        this.msg.GroupBy = "RB_Branch_Id";
-        this.msg.RB_Department_Id = 0;
-      } else {
-        this.msg.RB_Department_Id = 0;
-        this.msg.RB_Branch_Id = -1;
-        this.msg.GroupBy = "EnterID";
-        this.msg.QueryType = 4;
-      }
-      this.initColumns();
-      this.initData();
-    },
-    handleCurrentChanges(val) {
-      //   this.pageIndex = val;
-      //   this.tableData = this.getTableData().filter(
-      //     (item, index) => index == val - 1
-      //   );
-    },
-    sortChange(param) {
-      //自己写实现
-      let d = JSON.parse(JSON.stringify(this.tableData));
-      if (d && d.length > 0) {
-        if (param.income != "") {
-          this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
-        } else if (param.peopleCount != "") {
-          this.tableData = this.orderBy(
-            d,
-            ["peopleCount"],
-            param.peopleCount
-          ).results;
-        } else if (param.avgPrice != "") {
-          this.tableData = this.orderBy(
-            d,
-            ["avgPrice"],
-            param.avgPrice
-          ).results;
-        } else if (param.notInCome != "") {
-          this.tableData = this.orderBy(
-            d,
-            ["notInCome"],
-            param.notInCome
-          ).results;
-        } else if (param.PreferPrice != "") {
-          this.tableData = this.orderBy(
-            d,
-            ["PreferPrice"],
-            param.PreferPrice
-          ).results;
-        } else if (param.CalcheCount != "") {
-          this.tableData = this.orderBy(
-            d,
-            ["CalcheCount"],
-            param.CalcheCount
-          ).results;
         }
-      }
+      },
+      filterMethod(filters) {},
     },
-    filterMethod(filters) {},
-  },
-};
+  };
+
 </script>
 <style scoped>
-.salesVolumeRank-box .query-box {
-  padding: 0 !important;
-  border-bottom: 0px;
-}
-.salesVolumeRank-box .el-tabs__nav-wrap::after {
-  height: 1px;
-}
-.salesVolumeRank-box .el-date-editor.el-input,
-.salesVolumeRank-box .el-date-editor.el-input__inner {
-  width: 100% !important;
-}
-.salesVolumeRank-box .el-date-editor .el-range-input,
-.el-date-editor .el-range-separator {
-  font-size: 12px;
-}
-/deep/.salesVolumeRank-box .el-table th.el-table__cell{
-  background-color: #E6E6E6 !important;
-}
-.clickText{
-  color: #33B3FF;
-  cursor: pointer;
-}
+  .salesVolumeRank-box .query-box {
+    padding: 0 !important;
+    border-bottom: 0px;
+  }
+
+  .salesVolumeRank-box .el-tabs__nav-wrap::after {
+    height: 1px;
+  }
+
+  .salesVolumeRank-box .el-date-editor.el-input,
+  .salesVolumeRank-box .el-date-editor.el-input__inner {
+    width: 100% !important;
+  }
+
+  .salesVolumeRank-box .el-date-editor .el-range-input,
+  .el-date-editor .el-range-separator {
+    font-size: 12px;
+  }
+
+  /deep/.salesVolumeRank-box .el-table th.el-table__cell {
+    background-color: #E6E6E6 !important;
+  }
+
+  .clickText {
+    color: #33B3FF;
+    cursor: pointer;
+  }
+
 </style>