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

src/components/FinancialModule/BasicDocuments.vue

@@ -1721,6 +1721,16 @@ export default {
                         tab: "国内销售提成详情" 
                     }
                 });
+            }else if(GetDetail.OtherType==69){//跳转台湾提成的三级详情
+                this.$router.push({
+                    name: 'domesticCommissiondetailsTW',
+                    query: { 
+                        PeriodId:GetDetail.ReFinanceId,
+                        OutBranchId: GetDetail.RB_Branch_Id, 
+                        blank: "y", 
+                        tab: "台湾销售提成详情" 
+                    }
+                });
             }else{
                 this.$router.push({
                     name: 'CommissionDetail',

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1182,6 +1182,16 @@ export default {
                         tab: "国内销售提成详情" 
                     }
                 });
+            }else if(GetDetail.OtherType==69){//跳转台湾提成的三级详情
+                this.$router.push({
+                    name: 'domesticCommissiondetailsTW',
+                    query: { 
+                        PeriodId:GetDetail.ReFinanceId,
+                        OutBranchId: GetDetail.RB_Branch_Id, 
+                        blank: "y", 
+                        tab: "台湾销售提成详情" 
+                    }
+                });
             }else{
                 this.$router.push({
                     name: 'CommissionDetail',

src/components/FinancialModule/domesticCommissionTW.vue

@@ -65,7 +65,7 @@
                 <th>总提成</th>
                 <th>所属公司提成</th>
                 <th>财务单据</th>
-                <th width="150">汇率</th>
+                <th width="280">汇率</th>
                 <th>操作信息</th>
                 <th>操作</th>
             </tr>
@@ -91,16 +91,16 @@
                             <div
                             :style="{'border-top': y!=0? '1px solid #eeee':''}"
                             style="text-align: left;">
-                                <span style="cursor: pointer;">
+                                <span v-if="x.OutBranchName">{{x.OutBranchName}}：</span>
+                                <span>
                                     {{x.Rate?x.Rate:'未设汇率'}}
                                 </span>
                                <span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
                                
                             </div>
                             <div style="flex-shrink: 0;justify-content: end;align-items: flex-end;" 
-                            v-if="y==item.CurrencyRateList.length-1">
-                                <i v-if="item.FinanceIdList.length==0" 
-                               class="el-icon-edit" 
+                            v-if="y==item.CurrencyRateList.length-1&&isRateAuthoTW&&item.FinanceIdList.length==0">
+                                <i class="el-icon-edit" 
                                style="color: #409eff;cursor: pointer;" @click="editRate(item)"></i>
                             </div>
                     </div>
@@ -116,7 +116,7 @@
                                 icon="iconfont icon-chakan" circle></el-button>
                         </el-tooltip>
                         <el-tooltip v-if="cMaker==true&&item.BranchCommission>0&&item.CurrencyRateList[0].Rate>0" class="item" effect="dark" content="制单" placement="top">
-                            <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true" 
+                            <el-button @click="YijianZD(item)" type="danger" class="CM_look"
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
                     </div>
@@ -208,6 +208,7 @@
                 btnLoading: false,
                 BranchList:[],
                 cMaker:false,//是否可以制单
+                isRateAuthoTW: false,//是否可以修改汇率
             }
         },
         mounted() {
@@ -220,6 +221,9 @@
             if (ActionMenuCode.indexOf('home_DCommissionZD') != -1) {
                 this.cMaker = true;
             }
+            if (ActionMenuCode.indexOf('isRateAuthoTW') != -1){
+                this.isRateAuthoTW = true
+            }
             
             this.getList();
             this.getCompanyList()
@@ -377,7 +381,8 @@
                     XSTC: 1,
                     OtherType:69,
                     ReFinanceId:item.Id,
-                    Rate: item.CurrencyRateList[0].Rate
+                    Rate: item.CurrencyRateList[0].Rate,
+                    OutBranchId: this.msg.OutBranchId
                 }
                 let query = {
                     blank: "y",

src/components/FinancialModule/domesticCommissiondetailsTW.vue

@@ -218,6 +218,9 @@
         if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
           this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
         }
+        if (this.$route.query.OutBranchId && this.$route.query.OutBranchId!='') {
+          this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
+        }
       }
       if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
         this.disabled = false;

src/components/FinancialModule/platOrderquery.vue

@@ -241,8 +241,10 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
           <p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-          <!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
-          <p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
+          <!-- <p v-if='item.commissionMoney' style="color:red">
+            {{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}{{item.commissionCurrency}}</p>
+          <p v-else-if="item.latestCommissionMoney" style="color:red">
+            {{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
           <div>
                   <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
                     <p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>

src/components/SalesModule/enrollTotalForAirUnion.vue

@@ -109,7 +109,7 @@
             <p class="fz12 over_ellipsis" style="width: 100%;">
               {{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>发团：{{item.startDate}}</p>
-            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+            <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
             <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
             <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span
                 style="color:#e95252">{{item.extraRewardMoney}}</span></div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1841,7 +1841,7 @@
                     isUpdateOrder
                   ">
                   <p v-if="item.commissionMoney" style="color: red">
-                    提成：{{ item.commissionMoney }}
+                    提成：{{ item.commissionMoney }} {{ item.commissionCurrency }}
                   </p>
                   <p v-else-if="item.latestCommissionMoney" style="color: red">
                     提成：{{ item.latestCommissionMoney }}
@@ -2688,7 +2688,7 @@
                   isUpdateOrder
                 ">
                 <p v-if="item.commissionMoney" style="color: red">
-                  提成：{{ item.commissionMoney }}
+                  提成：{{ item.commissionMoney }} {{item.CommissionCurrency}}
                 </p>
                 <p v-else-if="item.latestCommissionMoney" style="color: red">
                   提成：{{ item.latestCommissionMoney }}

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -1569,7 +1569,7 @@
                 <p>下单时间：{{item.createDate}}</p>
                 <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
                 <template v-if="item.isOwn==1||IsSupperOrderEdit||IsLookOrder||isUpdateOrder">
-                  <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+                  <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
                   <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
                 </template>
               </td>

src/components/SalesModule/planeTourOrder.vue

@@ -1178,7 +1178,7 @@
 						<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
 						<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
-            <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}</p>
+            <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
             <p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>
           </td>
           <td>

src/components/SalesVisa/VisaShouSun.vue

@@ -129,7 +129,7 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
           <p>发团：{{item.startDate}}</p>
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
           <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
           <div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>

src/components/Ticketing/IndividualTicketOrder.vue

@@ -147,8 +147,10 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
           <p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-          <!-- <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}}</p>
-          <p v-else-if="item.latestCommissionMoney" style="color:red">{{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
+          <!-- <p v-if='item.commissionMoney' style="color:red">
+            {{$t('salesModule.CommissionNum')}}：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
+          <p v-else-if="item.latestCommissionMoney" style="color:red">
+            {{$t('salesModule.CommissionNum')}}：{{item.latestCommissionMoney}}</p> -->
           <div>
                   <div style="color:green" v-if="item.commissionMoney==''||item.commissionMoney=='-1'">
                     <p v-if="item.extraRewardMoney>0">{{$t('salesModule.EWJLJE')}}：{{item.extraRewardMoney}}</p>

src/components/Ticketing/TicketShouSun.vue

@@ -129,7 +129,7 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
           <p>发团：{{item.startDate}}</p>
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
           <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
           <div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -255,8 +255,13 @@
                 </div>
                 <div class="Team_Incontent" style="margin-bottom:0;">
                     <div class="TeamExpectList">
-                      <template v-for="subItem in DataList.ExpectedCutList">
-                        <div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
+                      <template v-for="(subItem,index) in DataList.ExpectedCutList">
+                        <div style="margin-bottom:5px;">{{subItem.BranchName}} <template>￥</template>{{subItem.expectedCut}}
+                          <span style="margin-left: 5px;font-size: 10px;" v-if="subItem.CurrencyName">{{subItem.CurrencyName}}</span>
+                          <span style="font-size: 10px;color: #ff9c00;margin-left: 5px;" v-if="subItem.StandardMoney">
+                             结算{{subItem.StandardMoney}}{{DataList.TeamBalance.StandardCurrencyName}}
+                          </span>
+                        </div>
                       </template>
                     </div>
                   </div>

src/components/administrative/ConfirmationAdui.vue

@@ -119,7 +119,7 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
           <p>发团：{{item.startDate}}</p>
           <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
+          <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}} {{item.commissionCurrency}}</p>
           <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
           <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
           <div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>

src/components/dmc/manager/dmcShouSun.vue

@@ -142,7 +142,8 @@
               {{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
             <p>{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
             <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-            <p v-if='item.commissionMoney' style="color:red">{{$t('salesModule.Commission')}}：{{item.commissionMoney}}
+            <p v-if='item.commissionMoney' style="color:red">
+              {{$t('salesModule.Commission')}}：{{item.commissionMoney}}{{item.commissionCurrency}}
             </p>
             <p v-else-if="item.latestCommissionMoney" style="color:red">
               {{$t('salesModule.Commission')}}：{{item.latestCommissionMoney}}</p>