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

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -284,6 +284,7 @@
             
           }
         }
+        this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
         this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
         this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -276,6 +276,7 @@
             
           }
         }
+        this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
         this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
         this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:''
         this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1

src/components/FinancialModule/TradeCommission/TicketUserDetails.vue

@@ -377,7 +377,7 @@
                     path: path,
                     query: {
                         PeriodId: this.$route.query.PeriodId,
-                        OutBranchId: item.RB_Branch_Id,
+                        // OutBranchId: item.RB_Branch_Id,
                         UserId: item.UserId,  
                         blank: 'y',
                         tab: '同业提现详情'

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -377,6 +377,17 @@
                     <span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
                     <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
                   </div>
+                  <div class="TC_TravelSalePlat clearfix" v-if="item.Royalty"
+                    style="display: flex;flex-wrap: wrap;align-items: baseline;">
+                    <span class="TC_neibu"
+                      style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}}
+                      期</span>
+                    <span style="cursor: pointer;" v-for="x in item.Royalty.List"
+                      @click="goRoyaltyUrl(item,item.Royalty,x)" class="TC_neibu"
+                      :style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
+                      {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
+                    </span>
+                  </div>
                 </div>
               </div>
               <div class="el-col" style="width:200px;">
@@ -817,6 +828,7 @@
     },
     data() {
       return {
+        isCommissionDetails: false, //团控提成详情权限
         dialog: {
           show: false,
           ConfigId: '',
@@ -976,6 +988,32 @@
           this.$refs.dialog.getPostData()
         })
       },
+      // 查看团详情
+      goRoyaltyUrl(row, Royalty, item) {
+        let name
+        let obj = {
+          isSearch: true,
+          blank: "y"
+        }
+        if (Royalty.Type == 3) {
+          name = 'OpComPersonDetails'
+          obj.EmployeeId = item.UserId
+          obj.TCNUM = row.TCNUM
+        } else if (Royalty.Type == 2) {
+          name = 'OPsalesCommissiondetails'
+          obj.UserId = item.UserId
+          obj.TCNUM = row.TCNUM
+        } else {
+          name = 'ServiceCommissiondetails'
+          obj.UserId = item.UserId
+          obj.TCNUM = row.TCNUM
+          obj.Type = 2
+        }
+        this.$router.push({
+          name: name,
+          query: obj
+        })
+      },
       downloadFile: function (item) {
         let reg = /^http(s)?:\/\/(.*?)\//;
         this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);
@@ -1087,11 +1125,38 @@
                   });
                 }
               });
+              if (!this.isCommissionDetails) return
+              this.getDetailsOfRoyalty()
             }
           },
           err => {}
         );
       },
+      getDetailsOfRoyalty() {
+        let Ids = this.queryCommonData.dataList.map(x => {
+          return x.TCID
+        })
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "commission_get_GetTravelOPCommissionList", {
+            TCIDStr: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let RoyaltyList = []
+              RoyaltyList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                RoyaltyList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.Royalty = y
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+      },
 
       //验证大小
       checkTeamNum(queryMsg) {
@@ -1557,7 +1622,11 @@
       //默认显示联运
       this.queryMsg.IsShowUnion = 1;
       let userInfo = this.getLocalStorage();
-
+      // 团提成权限
+      let ActionMenuCode = userInfo.ActionMenuCode;
+      if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
+        this.isCommissionDetails = true;
+      }
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }