Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/css/endTravelManager.css

@@ -605,7 +605,6 @@
     left:50%;
     transform: translate3d(-50%,-50%,0);
     width: 180px;
-    display:none;
     text-align:center;
     z-index:3
   }

src/assets/css/home/Saleshomepage_1920.css

@@ -10,15 +10,16 @@
   .PersonalData{width: 100%;height: 350px;background: white;margin-top: 10px}
   .PersonalData_l{width: 100%;height: 368px;overflow-x: auto;padding: 20px}
   .PersonalData_l .l_top{width: 700px;height: 118px;}
-  .l_top .tx_img{width: 94px;height: 94px;border-radius: 50%;overflow: hidden;float: left}
+  .l_top .tx_img{width: 94px;height: 94px;border-radius: 50%;overflow: hidden;float: left;margin-top: 10px;}
   .l_top .img{width: 60px;height: 60px;
     margin-left: 10px;
-    /* margin-left: 90px; */
     float: left;margin-top: 15px}
   .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}
+  .l_top .royalty{margin-left: 30px;float: left;
+    margin-top: 10px;
+    display: flex;flex-direction: column}
   .l_top .royalty .tc{display: flex;
     flex-direction: column;
     align-items: flex-start}

src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue

@@ -164,13 +164,9 @@
                   this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
                 }
             }
-
             if (this.$route.query && this.$route.query.PeriodId) {
                 this.msg.PeriodId = this.$route.query.PeriodId
             }
-            if (this.$route.query && this.$route.query.Type) {
-                this.msg.Type = this.$route.query.Type
-            }
             this.getqishilist()
             this.getCompanyList()//获取公司
             this.getEmployee()//人员
@@ -259,12 +255,12 @@
                 this.$router.push({
                     path: path,
                     query: {
-                        PeriodId: this.$route.query.PeriodId,
+                        PeriodId: this.msg.PeriodId,//this.$route.query.PeriodId
                         UserId:item.UserId,
                         RB_Branch_Id:item.RB_Branch_Id,
                         RB_Department_Id:item.RB_Department_Id,
                         blank: 'y',
-                        Type: this.msg.Type,
+                        Type: this.msg.Type?this.msg.Type:1,
                         tab: '单项服务提现详情',
                     }
                 });

src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue

@@ -158,7 +158,7 @@
                 </td> -->
       </tr>
       <tr v-if="dataList.length==0">
-        <td style="text-align:center" colspan="11">暂无数据</td>
+        <td style="text-align:center" colspan="14">暂无数据</td>
       </tr>
     </table>
     <!-- 分页 -->
@@ -309,7 +309,7 @@
               if (this.PeriodsList && this.PeriodsList.length > 0) {
                 // this.msg.Periods = Number(this.PeriodsList[0].Id)
               }
-
+              this.getList()
             } else {
               this.Error(res.data.message);
             }

src/components/myOrdersAllType/components/allList.vue

@@ -627,8 +627,7 @@
           this.msg.StartTime = this.getBeforeDate(0, new Date())
           this.msg.EndTime = this.getBeforeDate(0, new Date())
           this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
-          if(this.$route.query.Q_IsCollect){
-            this.msg.Q_IsCollect=this.$route.query.Q_IsCollect
+          if(this.$route.query.DepartSTime){
             this.msg.DepartSTime=this.$route.query.DepartSTime
             this.msg.DepartETime=this.$route.query.DepartETime
             this.msg.CommissionType = this.$route.query.CommissionType

src/components/rank/salesVolumeRank.vue

@@ -529,9 +529,13 @@ 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]
+      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;

src/components/sale/ExpectedCommission.vue

@@ -312,7 +312,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="ProfitRate"
-              label="提成" width="150">
+              label="提成" width="60">
                 <template slot-scope="scope">
                   <template v-if="scope.row.Way==1">
                     {{scope.row.Money+'/人'}}
@@ -388,21 +388,16 @@
 
 
     </div>
-
-    <!-- 消息通知 -->
-    <notification v-if="rightOpen" @close="rightOpen = false"></notification>
   </div>
 </template>
 
 <script>
-  import notification from './components/notification'
   import OrderList from './components/OrderList'
   import detailsButtom from './components/details'
   // import OrderList from '../myOrdersAllType/components/OrderList'
   import progressComm from './components/progressComm'
   export default {
     components: {
-      notification,
       OrderList,
       progressComm,
       detailsButtom

src/components/sale/components/details.vue

@@ -57,7 +57,6 @@
           this.$router.push({
             name: name,
             query: {
-              Q_IsCollect: "1",
               DepartSTime: DepartSTime,
               DepartETime: DepartETime,
               CommissionType: String(this.type),

src/components/sale/components/notification.vue

-<template>
-  <div>
-     <div class="ListCar-form"></div>
-      <div class="ListCar-form-box">
-          <div class="ListCar-box">
-              <div class="normalBtn ListCar-close" @click="close">
-                  <i class="el-icon-close"></i>
-              </div>
-
-          </div>
-      </div>
-  </div>
-</template>
-<script>
-  export default {
-    props: {
-      parameters: {
-          type: Object,
-          require: false
-      },
-    },
-    data() {
-      return {
-          loading: false,
-          sysMsgList: [],
-      };
-    },
-    watch: {
-      parameters: {
-          handler: function (val, oldVal) {
-
-          },
-          deep: true
-      }
-    },
-    created() {
-
-    },
-    mounted() {
-
-
-    },
-    methods: {
-      // 关闭
-      close(){
-          this.$emit('close')
-      },
-    }
-  };
-
-</script>
-
-<style scoped>
-  .ListCar-form{
-      position: fixed;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background: rgba(23,23,23,.5);
-      z-index: 3;
-  }
-  .ListCar-form-box{
-      position: fixed;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      width: 550px;
-      background: #ffffff;
-      z-index: 100;
-  }
-  .ListCar-box{
-      width: 100%;
-      height: 100%;
-      position: relative;
-      padding: 15px 0;
-  }
-  .ListCar-close{
-      position: absolute;
-      left: -47px;
-      top: 20%;
-      line-height: 26px;
-  }
-  .ListCar-close i{
-      margin-left: 3px;
-  }
-  .normalBtn.ListCar-close{
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-      padding: 0 8px !important;
-  }
-  .ListCar-header{
-      border-bottom:                                                                                                                                                   -;
-  }
-  .ListCar-header-right{
-      border-radius: 3px;
-      padding: 5px 8px;
-      background: #fff3e0;
-  }
-
-</style>

src/components/sale/components/progressComm.vue

@@ -52,7 +52,8 @@
         border-radius: 0 !important;
     }
     /deep/.relative-position .el-progress-bar__inner{
-        text-align: center;
+        text-align: left;
+        text-indent: 10px;
         border-radius: 0 !important;
     }
     /deep/.relative-position:first-child .el-progress{
@@ -71,13 +72,12 @@
     <div class="progress-box">
       <div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
       class="relative-position">
-      <!-- :text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
-            (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#fff':'#666666'" -->
             <el-progress :text-inside="true" :stroke-width="20"
             :percentage="setItemProgress(item)"
             :status="setItemStatus(item)"
             :format="setItemText(item)"
-
+            :text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
+            (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#666666':'#666666'"
             :color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
             (commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]">
             </el-progress>

src/components/sale/sale.vue

@@ -60,29 +60,30 @@
                     <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  @click="goAnticipate(5)" style="cursor: pointer;">
+                        <div v-if="SumPreferPrice" style="padding: 2px 0 0 0;"><a style="color: #666666;font-size: 14px;font-weight: bold;">{{SumPreferPrice}}</a></div>
+                        <div style="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>
                     <div style="display: flex;justify-content: space-between;">
                     <!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(1)"> -->
-                    <div class="royalty" style="cursor: pointer;" @click="goAnticipate(1)">
+                    <div style="cursor: pointer;cursor: pointer;position: relative;" class="royalty" @click="goAnticipate(1)">
                       <div class="tc">
                         <p>
                           <span>￥</span>
                           <span>{{data.totalCommission}}</span>
                         </p>
-                        <p style="margin-bottom: 3px;">
-                          <el-tag v-if="data.peopelBonus" size="mini" type="danger" effect="dark" style="color: #ffff;">奖+{{data.peopelBonus}}</el-tag>
-                          <!-- <span v-if="data.peopelBonus" style="margin-right: 10px;">奖励：+{{data.peopelBonus}}</span> -->
-                          <span style="color: #BDBDBD;font-size: 13px;
-                          padding: 0 0 5px 0;font-weight: 100;">{{data.periodsName}}期</span>
-                        </p>
+                        <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期<el-tag
+                          v-if="data.peopelBonus" size="mini" type="danger"
+                          effect="dark" style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">奖+{{data.peopelBonus}}</el-tag></p>
                       </div>
-                      <!--                      <span>￥<p class="tc">{{data.totalCommission}}</p></span>-->
                       <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
                         <span>出境提成</span>
-
                         <template v-if="data.comissionGeneralId>0">
                           <span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
                           <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share"
@@ -120,7 +121,7 @@
                     </div>
                     <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
                       <img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
-                      style="width: 15px;height: auto; position: absolute;right: -0;top: -10px;cursor: pointer;color: #33B3FF;"></img>
+                      style="width: 15px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
                     </el-tooltip>
                     </div>
                   </div>
@@ -602,6 +603,7 @@
   export default {
     data() {
       return {
+        SumPreferPrice: 0,
         rankingNum: 0,
         type: 1,
         defaultHeadImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
@@ -657,8 +659,12 @@
     },
     methods: {
       settStartDates() {
-        let date = moment().format('yyyy-MM-DD')
-        let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
+        let nowdays = new Date()
+        let Year = new Date().getFullYear()
+        let MonthTime = new Date().getMonth() + 1
+        let MonthDayNum = new Date(Year, 12, 0).getDate();
+        let date = Year+'-12-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)
+        let start = Year+'-01-01'
         this.PMMsg.tStartDates = [start, date]
       },
       initData() {
@@ -701,6 +707,7 @@
             tableData.forEach((item,index)=>{
               if(item.EnterID==Number(userInfo.EmployeeId)){
                 this.rankingNum = index+1
+                this.SumPreferPrice = item.SumPreferPrice
               }
             })
           });
@@ -718,15 +725,27 @@
           name = 'ServiceCommissionUser'
         }else if(type==4){
           name = 'saleExpectedCommission'
+        }else if(type==5){
+          name = 'salesVolumeRank'
+          this.$router.push({
+            name: name,
+            query: {
+              tStartDates: this.PMMsg.tStartDates,
+              blank: 'y'
+            }
+          });
         }
-        this.$router.push({
-          name: name,
-          query: {
-            UserId: Number(userInfo.EmployeeId),
-            isSale: 1,
-            blank: 'y'
-          }
-        });
+        if(type!=5){
+          this.$router.push({
+            name: name,
+            query: {
+              UserId: Number(userInfo.EmployeeId),
+              isSale: 1,
+              blank: 'y'
+            }
+          });
+        }
+
       },
       iWorkbench() {
         this.apipost('customerIndex_post_GetMySelfSellInfo', {}, res => {