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

src/components/FinancialModule/ServiceCommission/ServiceCommissionUser.vue

@@ -164,9 +164,7 @@
                   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
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getqishilist()
             this.getCompanyList()//获取公司
             this.getEmployee()//人员

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -26,7 +26,7 @@
     <div class="flexOne domesticCommissionUser">
         <div>
             <ul class="opUl">
-                
+
                 <li>
                     <em>人员</em>
                     <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
@@ -60,7 +60,7 @@
                     </el-select>
                 </li>
 
-                
+
             </ul>
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
@@ -80,7 +80,7 @@
                 <td>{{item.PeopleCount}}</td>
 
                 <td>{{item.CommissionMoney}}</td>
-               
+
                 <td>{{item.Periods}}</td>
 
                 <td>
@@ -140,9 +140,7 @@
                 this.disabled = true;
                 this.msg.UserId = Number(userInfo.EmployeeId)
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司
@@ -233,7 +231,7 @@
                         PeriodId: this.$route.query.PeriodId,
                         UserId:item.UserId,
                         RB_Branch_Id:item.RB_Branch_Id,
-                        RB_Department_Id:item.RB_Department_Id,   
+                        RB_Department_Id:item.RB_Department_Id,
                         blank: 'y',
                         tab: '国内提现详情'
                     }
@@ -260,4 +258,4 @@
 
         }
     }
-</script>
+</script>
\ No newline at end of file

src/components/FinancialModule/domesticCommissionUser.vue

@@ -160,9 +160,7 @@
                   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
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getqishilist()
 
             this.getCompanyList()//获取公司

src/components/FinancialModule/domesticCommissionUserTW.vue

@@ -26,7 +26,7 @@
     <div class="flexOne domesticCommissionUser">
         <div>
             <ul class="opUl">
-                
+
                 <li>
                     <em>人员</em>
                     <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
@@ -60,7 +60,7 @@
                     </el-select>
                 </li>
 
-                
+
             </ul>
         </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
@@ -70,7 +70,7 @@
                 <th>销售</th>
                 <th>团的数量</th>
 
-                
+
                 <th>提成金额</th>
                 <th>期数</th>
 
@@ -142,9 +142,7 @@
                 this.disabled = true;
                 this.msg.UserId = Number(userInfo.EmployeeId)
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();
             // this.getqishilist()
             this.getCompanyList()//获取公司
@@ -235,7 +233,7 @@
                         PeriodId: this.$route.query.PeriodId,
                         UserId:item.UserId,
                         RB_Branch_Id:item.RB_Branch_Id,
-                        RB_Department_Id:item.RB_Department_Id,   
+                        RB_Department_Id:item.RB_Department_Id,
                         blank: 'y',
                         tab: '国内提现详情'
                     }
@@ -262,4 +260,4 @@
 
         }
     }
-</script>
+</script>
\ No newline at end of file

src/components/FinancialModule/domesticCommissionUserTW2.vue

@@ -26,7 +26,7 @@
     <div class="flexOne domesticCommissionUser">
         <div>
             <ul class="opUl">
-                
+
                 <li>
                     <em>人员</em>
                     <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
@@ -37,7 +37,7 @@
                 </li>
                 <li>
                     <em>出团公司</em>
-                    <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" 
+                    <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
                     :disabled="S_CheckBranchOrder">
                         <el-option label="不限" :value="-1"></el-option>
                         <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
@@ -60,13 +60,13 @@
                             :value="item.DepartmentID"></el-option>
                     </el-select>
                 </li>
-                
+
             </ul>
         </div>
         <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
             <div style="display: flex;align-items: center;"></div>
             <input type="button" class="normalBtn" value="导出" @click="exportExcel">
-      
+
           </div>
         <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
             <tr>
@@ -75,7 +75,7 @@
                 <th>销售</th>
                 <!-- <th>团的数量</th> -->
 
-                
+
                 <th>提成金额</th>
                 <th>地接奖金</th>
                 <th>年终奖金</th>
@@ -160,9 +160,7 @@
                 this.S_CheckBranchOrder = true
                 this.msg.OutBranchId = userInfo.RB_Branch_id
             }
-            if (this.$route.query && this.$route.query.PeriodId) {
-                this.msg.PeriodId = this.$route.query.PeriodId
-            }
+            this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             if (this.$route.query && this.$route.query.OutBranchId) {
                 this.msg.OutBranchId = this.$route.query.OutBranchId
             }
@@ -262,7 +260,7 @@
                         PeriodId: this.$route.query.PeriodId,
                         UserId:item.UserId,
                         RB_Branch_Id:item.RB_Branch_Id,
-                        RB_Department_Id:item.RB_Department_Id,   
+                        RB_Department_Id:item.RB_Department_Id,
                         blank: 'y',
                         tab: '国内提现详情'
                     }
@@ -300,4 +298,4 @@
 
         }
     }
-</script>
+</script>
\ No newline at end of file

src/components/sale/ExpectedCommission.vue

@@ -242,7 +242,7 @@
               </div>
             </div>
           </div>
-          <div style="display: flex;">
+          <div style="display: flex;" v-if="isAnnualBonus">
             <div class="CommissionLadder Line" style="margin: 0;">
               <div style="display: flex;justify-content: space-between;">
                <span>年终奖(不含门票、包车、国内游)</span>
@@ -498,12 +498,21 @@
           IsSelectCRM: 0,//1来源crm
           IsMyOrder: 1,//1我的订单
         },
+        isAnnualBonus: false,// 年终奖权限
       };
     },
     mounted() {
       this.getList()
     },
     created() {
+      let userInfo = this.getLocalStorage();
+      // 年终奖权限 销售，  引流， 市场， 票务 ， 票務，总经理，总经理
+      if(userInfo.PostName.indexOf('销售')||userInfo.PostName.indexOf('引流')||
+      userInfo.PostName.indexOf('市场，')||userInfo.PostName.indexOf('票务')||
+      userInfo.PostName.indexOf('票務')||userInfo.PostName.indexOf('总经理')||
+      userInfo.PostName.indexOf('总经理')){
+        this.isAnnualBonus = true
+      }
       let nowdays = new Date()
       this.Year = new Date().getFullYear()
       this.LastMonthTime = new Date().getMonth()

src/components/sale/sale.vue

@@ -121,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: -13px;cursor: pointer;color: #33B3FF;"></img>
+                      style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
                     </el-tooltip>
                     </div>
                   </div>