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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -878,7 +878,7 @@
                   ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
               <span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48
                 || GetDetail.OtherType==63 || GetDetail.OtherType==64 || GetDetail.OtherType==69
-                || GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76
+                || GetDetail.OtherType==70 || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==85
                 || GetDetail.OtherType==73 || GetDetail.OtherType==77 || GetDetail.OtherType==78))
                 || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
                 && GetDetail.OtherType!=63 && GetDetail.OtherType!=64&&GetDetail.OtherType!=55&&GetDetail.OtherType!=56
@@ -2126,7 +2126,13 @@
           path = GetDetail.OtherType == 72 ? 'TradeTicketDetails' : 'TradeTicketUserDetails'
           obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
           obj.OutBranchId = null
-        } else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
+        }else if (GetDetail.OtherType == 85) { //销售年终奖励
+          obj.tab = '年终奖励详情'
+          path = 'YearBonusDetails'
+          obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
+          obj.Year = GetDetail.ReFinanceId
+        }
+         else if (GetDetail.OtherType == 73 || GetDetail.OtherType == 77) { //OP提成详情
           obj.tab = '出境OP提成详情'
           path = GetDetail.OtherType == 73 ? 'OpComPersonDetails' : 'OPCommissionDetail'
         } else if (GetDetail.OtherType == 78) { //票务提成详情

src/components/FinancialModule/TradeCommission/TicketCommission.vue

@@ -54,9 +54,8 @@
                     <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading"
                         @click="generateTable">{{$t('objFill.v101.FinancialModule.shengchengtc')}}</el-button>
                 </li>
-                <li v-show="btnShow2">
-                    <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading2"
-                        @click="generateTable2">{{$t('objFill.v101.FinancialModule.shengcnz')}}</el-button>
+                <li>
+                    <el-button size="mini" type="danger" style="border-radius:14px" @click="goBonusUrl('YearBonusCommission')">查看年终奖励</el-button>
                 </li>
             </ul>
         </div>
@@ -214,6 +213,17 @@
                     }
                 });
             },
+            goBonusUrl(path) {
+                let title = ''
+                    title = '年终奖励'
+                this.$router.push({
+                    path: path,
+                    query: {
+                        blank: 'y',
+                        tab: title
+                    }
+                });
+            },
             //获取数据
             getList() {
                 this.loading = true;

src/components/TravelContractView.vue

@@ -1635,8 +1635,7 @@
                   </template>
                 </div>
                 <br />
-                <div style="color:red;" v-if="CtObj.CType!=3">注：用房
-                  ：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
+                <div style="color:red;" v-if="CtObj.CType!=3">注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
               </div>
               <!-- 自愿购物 -->
               <div class="shoppings" :class="{'checkedNav':ActiveTab==6}">
@@ -2146,9 +2145,7 @@
                   </template>
                 </div>
                 <br>
-                <div style="color:red;" v-if="CtObj.CType!=3">注：用房
-                  ：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
-
+                <div style="color:red;" v-if="CtObj.CType!=3">注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
               </div>
               <!-- 自愿补充协议 -->
               <div class="activitys" :class="{'checkedNav':ActiveTab==7}">

src/components/onedayTripContract.vue

@@ -1033,8 +1033,7 @@
                       火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；
                     </div>
                     <div style="color: red" v-if="CtObj.CType!=3">
-                      注：用房
-                      ：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
+                      注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
                     </div>
                     <template v-if="CtObj.TeamType == 2">
                       <div>

src/components/sale/ExpectedCommission.vue

@@ -337,7 +337,7 @@
               <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年11月起始</span></p>
               <div class="CommissionInfor">
                 <span @click="IsYearBonus=true" style="cursor: pointer;">达标 <span style="margin-left: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span>个月(点击查看)</span>
-                <span><span>每月人数{{CommissionInfor.BonusMinPNum}}人以上</span><span v-if="CommissionInfor.TaskNum>0">，{{CommissionInfor.EnableDate}}起欧洲产品收客需达到 {{CommissionInfor.TaskNum}}人*New</span></span>
+                <span><span>每月人数{{CommissionInfor.BonusMinPNum}}人以上</span><span v-if="CommissionInfor.TaskNum>0">,并且 {{CommissionInfor.EnableDate}}起欧洲产品收客需达到 {{CommissionInfor.TaskNum}}人*New</span></span>
               </div>
               <div>
                 <progressComm :commissionratioList="AnnualBonus"></progressComm>

src/components/sale/sale.vue

@@ -115,7 +115,7 @@
                         </div>
                       </div>
                       <div style="border-left: 1px solid #eeeeee;width: 1px;"> </div>
-                      <div style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(3)">
+                      <div v-if="!(CurrentUserInfo.RB_Group_id==2&&CurrentUserInfo.RB_Branch_id==1245)" style="cursor: pointer;margin-left: 0;" class="royalty" @click="goAnticipate(3)">
                         <div class="tc">
                           <p>
                             <span>￥</span>
@@ -124,10 +124,10 @@
                           <p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.dxPeriodsName}}期</p>
                         </div>
                         <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
-                          <span>历史单项提成</span>
+                          <span>年终奖励</span>
                         </div>
                       </div>
-                      <el-tooltip class="item" effect="dark" content="预期提成" placement="top">
+                      <el-tooltip v-if="!(CurrentUserInfo.RB_Group_id==2&&CurrentUserInfo.RB_Branch_id==1245)" class="item" effect="dark" content="预期提成" placement="top">
                         <img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
                           style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
                       </el-tooltip>
@@ -672,7 +672,16 @@
         } else if (type == 2) { //国内
           name = 'domesticCommissionUser'
         } else if (type == 3) { //历史单项
-          name = 'ServiceCommissionUser'
+          if(this.data.dxPeriodsName=='-'){return;}
+          name = 'YearBonusDetails'
+          this.$router.push({
+            name: name,
+            query: {
+              Year:this.data.dxPeriodsName,
+              EmployeeId:Number(userInfo.EmployeeId),
+              blank: 'y'
+            }
+          });
         } else if (type == 4) { //预期提成
           name = 'saleExpectedCommission'
         } else if (type == 5) { //排名
@@ -685,7 +694,7 @@
             }
           });
         }
-        if (type != 5 && name) {
+        if (type != 5 && type != 3 && name) {
           this.$router.push({
             name: name,
             query: {

src/router/config.js

@@ -5380,6 +5380,22 @@ export default {
                 title: '同业提成'
               }
             },
+            {
+              path: '/YearBonusCommission',
+              name: 'YearBonusCommission',
+              component: resolve => require(['@/components/FinancialModule/TradeCommission/YearBonusCommission'], resolve),
+              meta: {
+                title: '年终奖励'
+              }
+            },
+            {
+              path: '/YearBonusDetails',
+              name: 'YearBonusDetails',
+              component: resolve => require(['@/components/FinancialModule/TradeCommission/YearBonusDetails'], resolve),
+              meta: {
+                title: '年终奖励明细'
+              }
+            },
             {
               path: '/TradeTicketUserDetails',
               name: 'TradeTicketUserDetails',