no message

src/assets/css/home/Saleshomepage_1920.css

@@ -15,7 +15,7 @@
     margin-left: 10px;
     /* margin-left: 90px; */
     float: left;margin-top: 15px}
-  .p_name{margin-left: 17px;margin-top: 25px;float: left}
+  .p_name{margin-left: 17px;margin-top: 15px;float: left}
   .p_name span:nth-child(1){font-size: 18px;color: #333333;display: block}
   .p_name span:nth-child(2){font-size: 12px;color: #333333;margin-top: 5px;display: block}
   .l_top .royalty{margin-left: 30px;float: left;margin-top: 17px;display: flex;flex-direction: column}

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -86,7 +86,7 @@
         <el-select v-model="msg.UserId" size="mini"
         @change="handleCurrentChange(1)" :disabled="disabled" filterable>
             <el-option label="不限" :value="-1"></el-option>
-            <el-option label="微途" :value="-2"></el-option>
+            <!-- <el-option label="微途" :value="-2"></el-option> -->
             <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
                 :value="item.empId"></el-option>
         </el-select>

src/components/index.vue

@@ -3663,12 +3663,20 @@
             } else {
               this.chosenIndex = id;
               if (localStorage.openMode && localStorage.openMode == 1)
-                this.$router.push({
-                  path: url,
-                  query: {
-                    blank: 'y'
-                  }
-                });
+                if(url=='/SalesVolumeRank'){
+                  this.$router.push({
+                    path: url,
+                    query: {}
+                  });
+                }else{
+                  this.$router.push({
+                    path: url,
+                    query: {
+                      blank: 'y'
+                    }
+                  });
+                }
+
               else
                 this.$router.push({
                   path: url,

src/components/magic.vue

+<template>
+  <div class="salesVolumeRank-box">
+
+  </div>
+</template>
+<script>
+import Vue from "vue";
+import moment from 'moment'
+export default {
+  data() {
+    return {
+
+    };
+  },
+  created() {},
+  mounted() {
+
+
+  },
+};
+</script>
+<style>
+
+</style>

src/components/rank/salesVolumeRank.vue

@@ -3,7 +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')"
@@ -138,7 +138,7 @@ import moment from 'moment'
 Vue.component("table-operation", {
   template: `<span>
         <a href="" @click.stop.prevent="update(rowData,index)">
- <span>{{content}}</span></a>
+ <span>{{content}}</span></a></span>
         `,
   props: {
     rowData: {
@@ -531,7 +531,7 @@ export default {
     settStartDates() {
       let date = moment().format('yyyy-MM-DD')
       let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
-      this.msg.tStartDates = [start, date]      
+      this.msg.tStartDates = [start, date]
     },
     handleClick(tab, event) {
       this.msg.EnterID = 0;
@@ -616,4 +616,4 @@ export default {
 .el-date-editor .el-range-separator {
   font-size: 12px;
 }
-</style>
+</style>
\ No newline at end of file

src/components/sale/ExpectedCommission.vue

@@ -146,7 +146,7 @@
               ">
               <span style="font-size: 16px;font-weight: bold;">公司所有国内出发线路(单团.散拚)</span>
                 <div>
-                  <detailsButtom :type="1" :obj="detailsInfor"/>
+                  <detailsButtom :type="1" :obj="commissionMsg"/>
                 </div>
               </div>
               <div class="groupTourOrder">
@@ -163,7 +163,7 @@
               <div class="title">
                 <span>日本小包团、落地团以及单项提成</span>
                 <div>
-                  <detailsButtom :type="2" :obj="detailsInfor"/>
+                  <detailsButtom :type="2" :obj="commissionMsg"/>
                 </div>
               </div>
               <p>当月个人毛利润</p>
@@ -192,7 +192,7 @@
               <div class="title">
                 <span>欧洲小包团、落地团以及单项提成</span>
                 <div>
-                  <detailsButtom :type="3" :obj="detailsInfor"/>
+                  <detailsButtom :type="3" :obj="commissionMsg"/>
                 </div>
               </div>
               <p>当月个人毛利润</p>
@@ -253,7 +253,7 @@
               <div style="display: flex;justify-content: space-between;">
                <span>年终奖(不含门票、包车、国内游)</span>
                <div>
-                <detailsButtom :type="4" :obj="detailsInfor"/>
+                <detailsButtom :type="4" :obj="commissionMsg"/>
                 </div>
               </div>
               <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年3月起始</span></p>
@@ -272,7 +272,7 @@
           <div style="display: flex;justify-content: space-between;">
             <span style="font-weight: bold;font-size: 16px;">国内提成</span>
             <div>
-              <detailsButtom :type="5" :obj="detailsInfor"/>
+              <detailsButtom :type="5" :obj="commissionMsg"/>
             </div>
           </div>
           <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span></p>

src/components/sale/components/details.vue

@@ -41,7 +41,9 @@
           name: name,
           query: {
             // UserId: Number(userInfo.EmployeeId),
-            isSale: 1,
+            Q_IsCollect: "2",
+            DepartSTime: this.obj.DepartSTime,
+            DepartETime: this.obj.DepartETime,
             blank: 'y'
           }
         });

src/components/sale/sale.vue

@@ -60,6 +60,9 @@
                     <div class="p_name">
                       <span>{{data.emName}}</span>
                       <span>{{data.postName}}</span>
+                      <div style="padding: 5px 0 0 0;font-size: 14px;color: #333333;" v-if="rankingNum">
+                        第<a style="color: #FF8C00;margin-left: 3px;margin-right: 3px;font-size: 18px;font-weight: bold;">{{rankingNum}}</a>名
+                      </div>
                     </div>
                     <div style="display: flex;justify-content: space-between;">
                     <!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(1)"> -->
@@ -594,9 +597,11 @@
 </template>
 <script>
   import leftNav from '../public/leftNav.vue'
+  import moment from 'moment'
   export default {
     data() {
       return {
+        rankingNum: 0,
         type: 1,
         defaultHeadImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
         style: {
@@ -627,6 +632,15 @@
         isSubmit: true,
         CurrentUserInfo: {},
         EditBtn: false,
+        PMMsg: {
+        RB_Branch_Id: -1,
+        RB_Department_Id: 0,
+        EnterID: 0,
+        tStartDates: [],
+        qStartDates: [],
+        GroupBy: "EnterID",
+        QueryType: 0,
+      },
       }
     },
     components: {
@@ -641,6 +655,56 @@
       }
     },
     methods: {
+      settStartDates() {
+        let date = moment().format('yyyy-MM-DD')
+        let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
+        this.PMMsg.tStartDates = [start, date]
+      },
+      initData() {
+        let userInfo = this.getLocalStorage();
+          let param = {
+            RB_Branch_Id:
+              this.PMMsg.RB_Branch_Id == -1 ? null : this.PMMsg.RB_Branch_Id,
+            RB_Department_Id:
+              this.PMMsg.RB_Department_Id == 0 ? null : this.PMMsg.RB_Department_Id,
+            EnterID: this.PMMsg.EnterID == 0 ? null : this.PMMsg.EnterID,//Number(userInfo.EmployeeId)
+            QStartDate:
+              this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2
+                ? this.PMMsg.tStartDates[0]
+                : null,
+            QEndDate:
+              this.PMMsg.tStartDates && this.PMMsg.tStartDates.length == 2
+                ? this.PMMsg.tStartDates[1]
+                : null,
+            CStartDate:
+              this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2
+                ? this.PMMsg.qStartDates[0]
+                : null,
+            CEndDate:
+              this.PMMsg.qStartDates && this.PMMsg.qStartDates.length == 2
+                ? this.PMMsg.qStartDates[1]
+                : null,
+            GroupBy: this.PMMsg.GroupBy,
+            QueryType: this.PMMsg.QueryType,
+          };
+          if (!param.QStartDate) {
+            param.QStartDate = "2019-01-01";
+          }
+          let tableData = []
+          this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
+            r.data.data.forEach((x) => {
+              x.incomeVal = parseFloat(x.income);
+              x.avgPrice = parseFloat(x.avgPrice);
+            });
+            tableData = r.data.data;
+            tableData.forEach((item,index)=>{
+              if(item.EnterID==Number(userInfo.EmployeeId)){
+                this.rankingNum = index+1
+              }
+            })
+          });
+        },
+
       // 销售预期提成
       goAnticipate(type){
         let userInfo = this.getLocalStorage();
@@ -942,6 +1006,7 @@
       },
     },
     mounted() {
+      this.settStartDates()
       this.GetAuth();
       this.CurrentUserInfo = this.getLocalStorage();
       var w = document.documentElement.clientWidth || document.body.clientWidth;
@@ -957,6 +1022,8 @@
       this.iWorkbench() //销售个人工作台接口
       this.grouplist() //销售首页小组工作台
       this.Financial_post_GetNotDealCount(); //待处理财务单据的个数
+      // 排名
+      this.initData()
     },
   }