销售预提成

src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue

@@ -154,10 +154,17 @@
             let ActionMenuCode = userInfo.ActionMenuCode;
             if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
                 this.disabled = false;
+                this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
             }else{
                 this.disabled = true;
-                this.msg.UserId = Number(userInfo.EmployeeId)
+                // this.msg.UserId = Number(userInfo.EmployeeId)
+                if(!this.$route.query.UserId){
+                  this.msg.UserId = Number(userInfo.EmployeeId)
+                }else{
+                  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
             }

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -302,7 +302,7 @@
 
             this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
             this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
-            this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
+
             if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
             ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
             ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
@@ -310,9 +310,11 @@
                 this.msg.OutBranchId = -1
                 this.msg.RB_Branch_Id = -1
                 // this.msg.RB_Department_Id = -1
-                this.msg.UserId = -1
+                this.msg.UserId = this.$route.query.UserId?this.$route.query.UserId:-1
+
             }else{
                 this.disabled = true;
+                this.msg.UserId = this.$route.query.UserId?this.$route.query.UserId:Number(userInfo.EmployeeId)
             }
 
 

src/components/FinancialModule/domesticCommissionUser.vue

@@ -150,9 +150,15 @@
             let ActionMenuCode = userInfo.ActionMenuCode;
             if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
                 this.disabled = false;
+                this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
             }else{
                 this.disabled = true;
-                this.msg.UserId = Number(userInfo.EmployeeId)
+                // this.msg.UserId = Number(userInfo.EmployeeId)
+                if(!this.$route.query.UserId){
+                  this.msg.UserId = Number(userInfo.EmployeeId)
+                }else{
+                  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

src/components/sale/sale.vue

@@ -69,7 +69,7 @@
                           <span>￥</span>
                           <span>{{data.totalCommission}}</span>
                         </p>
-                        <p v-if="data.peopelBonus">{{data.peopelBonus}}/人</p>
+                        <p v-if="data.peopelBonus">人头奖励：{{data.peopelBonus}}</p>
                         <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期</p>
                       </div>
                       <!--                      <span>￥<p class="tc">{{data.totalCommission}}</p></span>-->
@@ -112,8 +112,8 @@
                       </div>
                     </div>
                     <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
-                      <i class="el-icon-document" @click="goAnticipate(4)"
-                      style="position: absolute;right: -0;top: -10px;cursor: pointer;color: #33B3FF;"></i>
+                      <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>
                     </el-tooltip>
                     </div>
                   </div>
@@ -640,6 +640,7 @@
     methods: {
       // 销售预期提成
       goAnticipate(type){
+        let userInfo = this.getLocalStorage();
         let name
         if(type==1){
           name = 'TradeTicketUserDetails'
@@ -653,6 +654,7 @@
         this.$router.push({
           name: name,
           query: {
+            UserId: Number(userInfo.EmployeeId),
             isSale: 1,
             blank: 'y'
           }