no message

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,12 @@
                 </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;">
+                             结算{{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>